Changeset 124 for branches/samba-3.0/source/utils/net_rpc.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/utils/net_rpc.c (modified) (5 diffs)

branches/samba-3.0/source/utils/net_rpc.c

@@ -382 +382 @@
  *              stripped
  *
- * Main 'net_rpc_join()' (where the admain username/password is used) is 
+ * Main 'net_rpc_join()' (where the admin username/password is used) is
  * in net_rpc_join.c
  * Try to just change the password, but if that doesn't work, use/prompt
@@ -582 +582 @@
         const char *acct_name;
         uint32 acb_info;
-        uint32 unknown, user_rid;
+        uint32 acct_flags=0;
+        uint32 user_rid;
 
         if (argc < 1) {
@@ -612 +613 @@
 
         acb_info = ACB_NORMAL;
-        unknown = 0xe005000b; /* No idea what this is - a permission mask? */
+        acct_flags = SAMR_GENERIC_READ | SAMR_GENERIC_WRITE |
+                SAMR_GENERIC_EXECUTE | SAMR_STANDARD_WRITEDAC |
+                SAMR_STANDARD_DELETE | SAMR_USER_SETPASS | SAMR_USER_GETATTR |
+                SAMR_USER_SETATTR;
+        DEBUG(10, ("Creating account with flags: %d\n",acct_flags));
 
         result = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx, &domain_pol,
-                                          acct_name, acb_info, unknown,
+                                          acct_name, acb_info, acct_flags,
                                           &user_pol, &user_rid);
         if (!NT_STATUS_IS_OK(result)) {
@@ -5336 +5341 @@
         char *acct_name;
         uint32 acb_info;
-        uint32 unknown, user_rid;
+        uint32 user_rid;
+        uint32 acct_flags=0;
 
         if (argc != 2) {
@@ -5370 +5376 @@
         /* Create trusting domain's account */
         acb_info = ACB_NORMAL; 
-        unknown = 0xe00500b0; /* No idea what this is - a permission mask?
-                                 mimir: yes, most probably it is */
+        acct_flags = SAMR_GENERIC_READ | SAMR_GENERIC_WRITE |
+                SAMR_GENERIC_EXECUTE | SAMR_STANDARD_WRITEDAC |
+                SAMR_STANDARD_DELETE | SAMR_USER_SETPASS | SAMR_USER_GETATTR |
+                SAMR_USER_SETATTR;
 
         result = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx, &domain_pol,
-                                          acct_name, acb_info, unknown,
+                                          acct_name, acb_info, acct_flags,
                                           &user_pol, &user_rid);
         if (!NT_STATUS_IS_OK(result)) {