summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamen.mazdrashki@postpath.com>2009-09-18 00:20:23 +0300
committerAnatoliy Atanasov <anatoliy.atanasov@postpath.com>2009-09-30 15:48:41 +0300
commit0e1840b84a892d31cbc45191b2965db5c931670b (patch)
treee0c543e963bce1bb572451d26da348254ed91df0
parent948cd70bad6600a4e4e1493469efc0ccd9399c18 (diff)
downloadsamba-0e1840b84a892d31cbc45191b2965db5c931670b.tar.gz
samba-0e1840b84a892d31cbc45191b2965db5c931670b.tar.bz2
samba-0e1840b84a892d31cbc45191b2965db5c931670b.zip
w32err: WERR_GROUP_NOT_FOUND renamed to WERR_GROUPNOTFOUND
In Win 32 we have NERR_GroupNotFound which maps to WERR_GROUP_NOT_FOUND currently and we have ERROR_GROUP_NOT_FOUND which maps to nothing, so it is to be added Signed-off-by: Anatoliy Atanasov <anatoliy.atanasov@postpath.com>
-rw-r--r--libcli/util/doserr.c2
-rw-r--r--libcli/util/werror.h2
-rw-r--r--source3/lib/netapi/group.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 1c1a39f7f9..c87187eea6 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -66,7 +66,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_BUF_TOO_SMALL", WERR_BUF_TOO_SMALL },
{ "WERR_JOB_NOT_FOUND", WERR_JOB_NOT_FOUND },
{ "WERR_DEST_NOT_FOUND", WERR_DEST_NOT_FOUND },
- { "WERR_GROUP_NOT_FOUND", WERR_GROUP_NOT_FOUND },
+ { "WERR_GROUPNOTFOUND", WERR_GROUPNOTFOUND },
{ "WERR_USER_NOT_FOUND", WERR_USER_NOT_FOUND },
{ "WERR_NOT_LOCAL_DOMAIN", WERR_NOT_LOCAL_DOMAIN },
{ "WERR_DOMAIN_CONTROLLER_NOT_FOUND", WERR_DOMAIN_CONTROLLER_NOT_FOUND },
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index fa358c1fda..4b291d27e2 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -212,7 +212,7 @@ typedef uint32_t WERROR;
#define WERR_ALREADY_SHARED W_ERROR(0x00000846)
#define WERR_JOB_NOT_FOUND W_ERROR(0x00000867)
#define WERR_DEST_NOT_FOUND W_ERROR(0x00000868)
-#define WERR_GROUP_NOT_FOUND W_ERROR(0x000008AC)
+#define WERR_GROUPNOTFOUND W_ERROR(0x000008AC)
#define WERR_USER_NOT_FOUND W_ERROR(0x000008AD)
#define WERR_USEREXISTS W_ERROR(0x000008B0)
#define WERR_NOT_CONNECTED W_ERROR(0x000008CA)
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 004fd3aff6..77ed2e8485 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -784,12 +784,12 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
&rids,
&types);
if (!NT_STATUS_IS_OK(status)) {
- werr = WERR_GROUP_NOT_FOUND;
+ werr = WERR_GROUPNOTFOUND;
goto done;
}
if (types.ids[0] != SID_NAME_DOM_GRP) {
- werr = WERR_GROUP_NOT_FOUND;
+ werr = WERR_GROUPNOTFOUND;
goto done;
}
@@ -905,12 +905,12 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
&rids,
&types);
if (!NT_STATUS_IS_OK(status)) {
- werr = WERR_GROUP_NOT_FOUND;
+ werr = WERR_GROUPNOTFOUND;
goto done;
}
if (types.ids[0] != SID_NAME_DOM_GRP) {
- werr = WERR_GROUP_NOT_FOUND;
+ werr = WERR_GROUPNOTFOUND;
goto done;
}