Fix flags in all callers of lookup_name() in net_sam.c.

Michael
(This used to be commit 6d0db17a9e255235d40eabc63e91c9f5d4febcde)

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index c82c89bf42a32684b3db093fd7f6a533f16fc892..139eed6b95aa3e4b352aea48e8a3b3a1fb0db5a9 100644 (file)
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -41,7 +41,7 @@ static int net_sam_userset(int argc, const char **argv, const char *field,
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;
@@ -138,7 +138,7 @@ static int net_sam_set_userflag(int argc, const char **argv, const char *field,
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;
@@ -222,7 +222,7 @@ static int net_sam_set_pwdmustchangenow(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;
@@ -283,7 +283,7 @@ static int net_sam_set_comment(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;
@@ -569,7 +569,7 @@ static int net_sam_rights_grant(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;
@@ -602,7 +602,7 @@ static int net_sam_rights_revoke(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;
@@ -654,7 +654,7 @@ static NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *pmap)
        map.gid = grp->gr_gid;
        grpname = grp->gr_name;
 
-       if (lookup_name(talloc_tos(), grpname, LOOKUP_NAME_ISOLATED,
+       if (lookup_name(talloc_tos(), grpname, LOOKUP_NAME_LOCAL,
                        &dom, &name, NULL, NULL)) {
 
                const char *tmp = talloc_asprintf(
@@ -665,7 +665,7 @@ static NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *pmap)
                grpname = tmp;
        }
 
-       if (lookup_name(talloc_tos(), grpname, LOOKUP_NAME_ISOLATED,
+       if (lookup_name(talloc_tos(), grpname, LOOKUP_NAME_LOCAL,
                        NULL, NULL, NULL, NULL)) {
                DEBUG(3, ("\"%s\" exists, can't map it\n", grp->gr_name));
                return NT_STATUS_GROUP_EXISTS;
@@ -740,7 +740,7 @@ static NTSTATUS unmap_unix_group(const struct group *grp, GROUP_MAP *pmap)
         map.gid = grp->gr_gid;
         grpname = grp->gr_name;
 
-        if (!lookup_name(talloc_tos(), grpname, LOOKUP_NAME_ISOLATED,
+        if (!lookup_name(talloc_tos(), grpname, LOOKUP_NAME_LOCAL,
                         NULL, NULL, NULL, NULL)) {
                 DEBUG(3, ("\"%s\" does not exist, can't unmap it\n", grp->gr_name));
                 return NT_STATUS_NO_SUCH_GROUP;
@@ -836,7 +836,7 @@ static int net_sam_deletelocalgroup(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find %s.\n", argv[0]);
                return -1;
@@ -929,7 +929,7 @@ static int net_sam_addmem(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &groupdomain, &groupname, &group, &grouptype)) {
                d_fprintf(stderr, "Could not find group %s\n", argv[0]);
                return -1;
@@ -937,7 +937,7 @@ static int net_sam_addmem(int argc, const char **argv)
 
        /* check to see if the member to be added is a name or a SID */
 
-       if (!lookup_name(talloc_tos(), argv[1], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[1], LOOKUP_NAME_LOCAL,
                         &memberdomain, &membername, &member, &membertype))
        {
                /* try it as a SID */
@@ -1002,13 +1002,13 @@ static int net_sam_delmem(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &groupdomain, &groupname, &group, &grouptype)) {
                d_fprintf(stderr, "Could not find group %s\n", argv[0]);
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[1], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[1], LOOKUP_NAME_LOCAL,
                         &memberdomain, &membername, &member, NULL)) {
                if (!string_to_sid(&member, argv[1])) {
                        d_fprintf(stderr, "Could not find member %s\n",
@@ -1060,7 +1060,7 @@ static int net_sam_listmem(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &groupdomain, &groupname, &group, &grouptype)) {
                d_fprintf(stderr, "Could not find group %s\n", argv[0]);
                return -1;
@@ -1209,7 +1209,7 @@ static int net_sam_show(int argc, const char **argv)
                return -1;
        }
 
-       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_ISOLATED,
+       if (!lookup_name(talloc_tos(), argv[0], LOOKUP_NAME_LOCAL,
                         &dom, &name, &sid, &type)) {
                d_fprintf(stderr, "Could not find name %s\n", argv[0]);
                return -1;