Changeset 745 for trunk/server/source3/utils/net_groupmap.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/utils/net_groupmap.c (modified) (18 diffs)

trunk/server/source3/utils/net_groupmap.c

@@ -23 +23 @@
 
 #include "includes.h"
+#include "system/passwd.h"
 #include "utils/net.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
 
 /*********************************************************
@@ -29 +32 @@
  Return the SID.
 **********************************************************/
-static bool get_sid_from_input(DOM_SID *sid, char *input)
+static bool get_sid_from_input(struct dom_sid *sid, char *input)
 {
         GROUP_MAP map;
@@ -124 +127 @@
         /* list a single group is given a name */
         if ( ntgroup[0] || sid_string[0] ) {
-                DOM_SID sid;
+                struct dom_sid sid;
                 GROUP_MAP map;
 
@@ -166 +169 @@
 static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
         fstring ntgroup = "";
         fstring unixgrp = "";
@@ -201 +204 @@
                 if ( !StrnCaseCmp(argv[i], "rid", strlen("rid")) ) {
                         rid = get_int_param(argv[i]);
-                        if ( rid < DOMAIN_GROUP_RID_ADMINS ) {
+                        if ( rid < DOMAIN_RID_ADMINS ) {
                                 d_fprintf(stderr,
                                           _("RID must be greater than %d\n"),
-                                          (uint32)DOMAIN_GROUP_RID_ADMINS-1);
+                                          (uint32)DOMAIN_RID_ADMINS-1);
                                 return -1;
                         }
@@ -300 +303 @@
         /* append the rid to our own domain/machine SID if we don't have a full SID */
         if ( !string_sid[0] ) {
-                sid_copy(&sid, get_global_sam_sid());
-                sid_append_rid(&sid, rid);
+                sid_compose(&sid, get_global_sam_sid(), rid);
                 sid_to_fstring(string_sid, &sid);
         }
@@ -337 +339 @@
 static int net_groupmap_modify(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
         GROUP_MAP map;
         fstring ntcomment = "";
@@ -485 +487 @@
 static int net_groupmap_delete(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID sid;
+        struct dom_sid sid;
         fstring ntgroup = "";
         fstring sid_string = "";
@@ -582 +584 @@
 
         if (!have_map) {
-                DOM_SID sid;
+                struct dom_sid sid;
                 have_map = ( (strncmp(ntgroup, "S-", 2) == 0) &&
                              string_to_sid(&sid, ntgroup) &&
@@ -613 +615 @@
                 }
 
-                sid_copy(&map.sid, get_global_sam_sid());
-                sid_append_rid(&map.sid, c->opt_rid);
+                sid_compose(&map.sid, get_global_sam_sid(), c->opt_rid);
 
                 map.sid_name_use = SID_NAME_DOM_GRP;
@@ -708 +709 @@
 static int net_groupmap_addmem(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID alias, member;
+        struct dom_sid alias, member;
 
         if ( (argc != 2) ||
@@ -731 +732 @@
 static int net_groupmap_delmem(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID alias, member;
+        struct dom_sid alias, member;
 
         if ( (argc != 2) ||
@@ -754 +755 @@
 static int net_groupmap_listmem(struct net_context *c, int argc, const char **argv)
 {
-        DOM_SID alias;
-        DOM_SID *members;
+        struct dom_sid alias;
+        struct dom_sid *members;
         size_t i, num;
 
@@ -787 +788 @@
 
 static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
-                                    const DOM_SID *domain_sid,
-                                    const DOM_SID *member)
+                                    const struct dom_sid *domain_sid,
+                                    const struct dom_sid *member)
 {
         uint32 *alias_rids;
@@ -805 +806 @@
 
         for (i = 0; i < num_alias_rids; i++) {
-                DOM_SID alias;
-                sid_copy(&alias, domain_sid);
-                sid_append_rid(&alias, alias_rids[i]);
+                struct dom_sid alias;
+                sid_compose(&alias, domain_sid, alias_rids[i]);
                 printf("%s\n", sid_string_tos(&alias));
         }
@@ -817 +817 @@
 {
         TALLOC_CTX *mem_ctx;
-        DOM_SID *domain_sid, *builtin_sid, member;
+        struct dom_sid *domain_sid, member;
 
         if ( (argc != 1) ||
@@ -835 +835 @@
 
         domain_sid = get_global_sam_sid();
-        builtin_sid = string_sid_talloc(mem_ctx, "S-1-5-32");
-        if ((domain_sid == NULL) || (builtin_sid == NULL)) {
+        if (domain_sid == NULL) {
                 d_fprintf(stderr, _("Could not get domain sid\n"));
                 return -1;
@@ -842 +841 @@
 
         if (!print_alias_memberships(mem_ctx, domain_sid, &member) ||
-            !print_alias_memberships(mem_ctx, builtin_sid, &member))
+            !print_alias_memberships(mem_ctx, &global_sid_Builtin, &member))
                 return -1;