s3:net sam provision: allocate the uid after composing the sid for Administrator

[amitay/samba.git] / source3 / utils / net_sam.c

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index e02837fbc61349f951bf446430f19115ebeb2343..bd88a526029c3f4261a7c6e6f82519087cc7277e 100644 (file)
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1780,12 +1780,6 @@ doma_done:
                                    "Admins group not available!\n"));
                        goto done;
                }
                                    "Admins group not available!\n"));
                        goto done;
                }

-               if (!winbind_allocate_uid(&uid)) {
-                       d_fprintf(stderr,
-                                 _("Unable to allocate a new uid to create "
-                                   "the Administrator user!\n"));
-                       goto done;
-               }

                name = talloc_strdup(tc, "Administrator");
                dn = talloc_asprintf(tc, "uid=Administrator,%s", lp_ldap_user_suffix());
                uidstr = talloc_asprintf(tc, "%u", (unsigned int)uid);
                name = talloc_strdup(tc, "Administrator");
                dn = talloc_asprintf(tc, "uid=Administrator,%s", lp_ldap_user_suffix());
                uidstr = talloc_asprintf(tc, "%u", (unsigned int)uid);


@@ -1806,6 +1800,13 @@ doma_done:
 
                sid_compose(&sid, get_global_sam_sid(), DOMAIN_RID_ADMINISTRATOR);
 
 
                sid_compose(&sid, get_global_sam_sid(), DOMAIN_RID_ADMINISTRATOR);
 

+               if (!winbind_allocate_uid(&uid)) {
+                       d_fprintf(stderr,
+                                 _("Unable to allocate a new uid to create "
+                                   "the Administrator user!\n"));
+                       goto done;
+               }
+

                smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_ACCOUNT);
                smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_POSIXACCOUNT);
                smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_SAMBASAMACCOUNT);
                smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_ACCOUNT);
                smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_POSIXACCOUNT);
                smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_SAMBASAMACCOUNT);