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>

diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 1c1a39f7f948ef78fcb250f34239873e6142eae9..c87187eea6d245a33a9dd95c279e823c2bbbacc0 100644 (file)
--- 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 fa358c1fda206e9fcb79b48322600172bb004f9a..4b291d27e2f4dc2481b935bd183b1b915117346f 100644 (file)
--- 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 004fd3aff6f08feddf25208a33d472e4bed808f1..77ed2e84854377e45c5d71ca08e077ba1d2bf044 100644 (file)
--- 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;
        }