s3/winbindd: using default domain with user@domain.com format fails

[metze/samba/wip.git] / source3 / winbindd / winbindd_util.c

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index f0344b1b26f4ddd052786cffc1646488fa3023f7..d7071738dcedb0bdf43b9086817ad955cbc9cd36 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -1103,10 +1103,11 @@ bool parse_domain_user(const char *domuser, fstring domain, fstring user)
 
        if ( !p ) {
                fstrcpy(user, domuser);
+               p = strchr(domuser, '@');
 
-               if ( assume_domain(lp_workgroup())) {
+               if ( assume_domain(lp_workgroup()) && p == NULL) {
                        fstrcpy(domain, lp_workgroup());
-               } else if ((p = strchr(domuser, '@')) != NULL) {
+               } else if (p != NULL) {
                        fstrcpy(domain, p + 1);
                        user[PTR_DIFF(p, domuser)] = 0;
                } else {