Changeset 740 for vendor/current/source3/utils/pdbedit.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/utils/pdbedit.c (modified) (18 diffs)

vendor/current/source3/utils/pdbedit.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "popt_common.h"
+#include "../librpc/gen_ndr/samr.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
 
 #define BIT_BACKEND     0x00000004
@@ -56 +60 @@
 #define MASK_USER_GOOD          0x60405FE0
 
-static int get_sid_from_cli_string(DOM_SID *sid, const char *str_sid)
+static int get_sid_from_cli_string(struct dom_sid *sid, const char *str_sid)
 {
         uint32_t rid;
@@ -69 +73 @@
                         return -1;
                 }
-                sid_copy(sid, get_global_sam_sid());
-                sid_append_rid(sid, rid);
+                sid_compose(sid, get_global_sam_sid(), rid);
         }
 
@@ -105 +108 @@
                 struct samu *user;
                 struct samu *account;
-                DOM_SID user_sid;
+                struct dom_sid user_sid;
 
                 DEBUG(4, ("Processing account %s\n", userentry.account_name));
@@ -203 +206 @@
 
         for (i=1; decode_account_policy_name(i) != NULL; i++) {
-                uint32 policy_value;
+                uint32_t policy_value;
                 if (!account_policy_get_default(i, &policy_value)) {
                         fprintf(stderr, "Can't get default account policy\n");
@@ -227 +230 @@
 
         for ( i=1; decode_account_policy_name(i) != NULL; i++ ) {
-                uint32 policy_value;
+                uint32_t policy_value;
                 NTSTATUS status;
 
@@ -263 +266 @@
         if (verbosity) {
                 char temp[44];
-                const uint8 *hours;
+                const uint8_t *hours;
 
                 printf ("Unix username:        %s\n", pdb_get_username(sam_pwent));
@@ -330 +333 @@
                        nt_passwd,
                        pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
-                       (uint32)convert_time_t_to_uint32(pdb_get_pass_last_set_time(sam_pwent)));
+                       (uint32)convert_time_t_to_uint32_t(pdb_get_pass_last_set_time(sam_pwent)));
         } else {
                 uid = nametouid(pdb_get_username(sam_pwent));
@@ -378 +381 @@
         struct samu *sam_pwent;
         TALLOC_CTX *tosctx;
-        DOM_SID user_sid;
+        struct dom_sid user_sid;
         bool bret;
         int ret;
@@ -436 +439 @@
         struct samu *sam_pwent;
         TALLOC_CTX *tosctx;
-        DOM_SID user_sid;
+        struct dom_sid user_sid;
         NTSTATUS status;
         bool bret;
@@ -506 +509 @@
         uint32_t not_settable;
         uint32_t new_flags;
-        DOM_SID u_sid;
+        struct dom_sid u_sid;
         bool ret;
 
@@ -525 +528 @@
                 memset(hours_array, 0xff, hours_len);
 
-                pdb_set_hours(sam_pwent, hours_array, PDB_CHANGED);
+                pdb_set_hours(sam_pwent, hours_array, hours_len, PDB_CHANGED);
         }
 
@@ -594 +597 @@
                         }
 
-                        value = convert_uint32_to_time_t(num);
+                        value = convert_uint32_t_to_time_t(num);
                 }
 
@@ -620 +623 @@
         uint32_t not_settable;
         uint32_t new_flags;
-        DOM_SID m_sid;
+        struct dom_sid m_sid;
         char *name;
         int len;
@@ -711 +714 @@
         TALLOC_CTX *tosctx;
         NTSTATUS status;
-        DOM_SID u_sid;
+        struct dom_sid u_sid;
         int flags;
         int ret;
@@ -808 +811 @@
         TALLOC_CTX *tosctx;
         NTSTATUS status;
-        DOM_SID m_sid;
+        struct dom_sid m_sid;
         char *compatpwd;
         char *name;
@@ -1057 +1060 @@
         load_case_tables();
 
-        setup_logging("pdbedit", True);
+        setup_logging("pdbedit", DEBUG_STDOUT);
 
         pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
@@ -1134 +1137 @@
         /* account policy operations */
         if ((checkparms & BIT_ACCPOLICY) && !(checkparms & ~(BIT_ACCPOLICY + BIT_ACCPOLVAL))) {
-                uint32 value;
+                uint32_t value;
                 enum pdb_policy_type field = account_policy_name_to_typenum(account_policy);
                 if (field == 0) {