Changeset 862 for trunk/server/source3/lib/netapi

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/netapi/group.c (modified) (12 diffs)
• source3/lib/netapi/localgroup.c (modified) (2 diffs)
• source3/lib/netapi/user.c (modified) (9 diffs)

trunk/server/source3/lib/netapi/group.c

@@ -310 +310 @@
         }
 
+
+
+
+
+
+
+
+
+
         if (types.ids[0] != SID_NAME_DOM_GRP) {
                 werr = WERR_INVALID_DATATYPE;
@@ -385 +394 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -510 +527 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -782 +807 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         if (types.ids[0] != SID_NAME_DOM_GRP) {
@@ -922 +955 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         if (types.ids[0] != SID_NAME_DOM_GRP) {
@@ -958 +999 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = WERR_USER_NOT_FOUND;
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -1066 +1115 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         if (types.ids[0] != SID_NAME_DOM_GRP) {
@@ -1103 +1160 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = WERR_USER_NOT_FOUND;
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -1515 +1580 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = dcerpc_samr_OpenGroup(b, talloc_tos(),
@@ -1557 +1630 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -1690 +1771 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = dcerpc_samr_OpenGroup(b, talloc_tos(),
@@ -1765 +1854 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
+
                 goto done;
         }

trunk/server/source3/lib/netapi/localgroup.c

@@ -59 +59 @@
                 return result;
         }
+
+
+
+
+
+
 
         switch (name_types.ids[0]) {
@@ -1042 +1048 @@
 
         if (count != 1 || sids.count != 1) {
-                return NT_STATUS_NONE_MAPPED;
+                return NT_STATUS_;
         }
 

trunk/server/source3/lib/netapi/user.c

@@ -605 +605 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = dcerpc_samr_OpenUser(b, talloc_tos(),
@@ -1804 +1812 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = libnetapi_samr_lookup_user_map_USER_INFO(ctx, pipe_cli,
@@ -1966 +1982 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -3027 +3051 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = dcerpc_samr_OpenUser(b, talloc_tos(),
@@ -3080 +3112 @@
             !NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -3202 +3242 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = dcerpc_samr_OpenUser(b, talloc_tos(),
@@ -3260 +3308 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }
@@ -3540 +3596 @@
                 goto done;
         }
+
+
+
+
+
+
+
+
 
         status = dcerpc_samr_OpenUser(b, talloc_tos(),
@@ -3659 +3723 @@
         if (!NT_STATUS_IS_OK(result)) {
                 werr = ntstatus_to_werror(result);
+
+
+
+
+
+
+
+
                 goto done;
         }