Changeset 745 for trunk/server/source3/winbindd/winbindd_getsidaliases.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/winbindd/winbindd_getsidaliases.c (modified) (4 diffs)

trunk/server/source3/winbindd/winbindd_getsidaliases.c

@@ -20 +20 @@
 #include "includes.h"
 #include "winbindd.h"
+#include "../libcli/security/security.h"
 
 struct winbindd_getsidaliases_state {
@@ -37 +38 @@
         struct winbindd_getsidaliases_state *state;
         struct winbindd_domain *domain;
-        size_t num_sids;
+        uint32_t num_sids;
         struct dom_sid *sids;
 
@@ -69 +70 @@
         sids = NULL;
 
-        if ((request->extra_data.data != NULL)
-            && !parse_sidlist(state, request->extra_data.data,
-                              &sids, &num_sids)) {
-                DEBUG(1, ("Could not parse SID list: %s\n",
-                          request->extra_data.data));
-                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                return tevent_req_post(req, ev);
+        if (request->extra_data.data != NULL) {
+                if (request->extra_data.data[request->extra_len-1] != '\0') {
+                        DEBUG(1, ("Got non-NULL terminated sidlist\n"));
+                        tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                        return tevent_req_post(req, ev);
+                }
+                if (!parse_sidlist(state, request->extra_data.data,
+                                   &sids, &num_sids)) {
+                        DEBUG(1, ("Could not parse SID list: %s\n",
+                                  request->extra_data.data));
+                        tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                        return tevent_req_post(req, ev);
+                }
+        }
+
+        if (DEBUGLEVEL >= 10) {
+                size_t i;
+                for (i=0; i<num_sids; i++) {
+                        fstring sidstr;
+                        sid_to_fstring(sidstr, &sids[i]);
+                        DEBUGADD(10, ("%s\n", sidstr));
+                }
         }
 
@@ -97 +113 @@
                                            &state->aliases);
         TALLOC_FREE(subreq);
-        if (!NT_STATUS_IS_OK(status)) {
-                tevent_req_nterror(req, status);
+        if (tevent_req_nterror(req, status)) {
                 return;
         }