Changeset 309 for branches/samba-3.3.x/source/winbindd

Timestamp:

Aug 4, 2009, 8:51:22 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.7

Location:

branches/samba-3.3.x/source/winbindd

Files:

• winbindd_sid.c (modified) (1 diff)
• winbindd_util.c (modified) (1 diff)

branches/samba-3.3.x/source/winbindd/winbindd_sid.c

@@ -94 +94 @@
                 name_domain = state->request.data.name.name;
                 name_user = p+1;
+        } else if ((p = strchr(state->request.data.name.name, '@')) != NULL) {
+                /* upn */
+                name_domain = p + 1;
+                *p = 0;
+                name_user = state->request.data.name.name;
         } else {
                 name_domain = state->request.data.name.dom_name;

branches/samba-3.3.x/source/winbindd/winbindd_util.c

@@ -1145 +1145 @@
                         fstrcpy(domain, lp_workgroup());
                 } else if ((p = strchr(domuser, '@')) != NULL) {
-                        fstrcpy(domain, "");                    
+                        fstrcpy(domain, p + 1);
+                        user[PTR_DIFF(p, domuser)] = 0;
                 } else {
                         return False;