Changeset 740 for vendor/current/source3/utils/smbpasswd.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/smbpasswd.c (modified) (6 diffs)

vendor/current/source3/utils/smbpasswd.c

@@ -18 +18 @@
 
 #include "includes.h"
-
-extern bool AllowDebugChange;
+#include "system/passwd.h"
+#include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
+#include "../lib/util/util_pw.h"
+#include "passdb.h"
 
 /*
@@ -153 +156 @@
                         break;
                 case 'D':
-                        DEBUGLEVEL = atoi(optarg);
+                        lp_set_cmdline("log level", optarg);
                         break;
                 case 'U': {
@@ -341 +344 @@
         }
 
-        if (!user_name[0] && (pwd = getpwuid_alloc(talloc_autofree_context(), geteuid()))) {
+        if (!user_name[0] && (pwd = getpwuid_alloc(talloc_tos(), geteuid()))) {
                 fstrcpy(user_name, pwd->pw_name);
                 TALLOC_FREE(pwd);
@@ -506 +509 @@
 
         if (!user_name[0]) {
-                pwd = getpwuid_alloc(talloc_autofree_context(), getuid());
+                pwd = getpwuid_alloc(talloc_tos(), getuid());
                 if (pwd) {
                         fstrcpy(user_name,pwd->pw_name);
@@ -569 +572 @@
         int ret;
 
-        AllowDebugChange = False;
-
 #if defined(HAVE_SET_AUTH_PARAMETERS)
         set_auth_parameters(argc, argv);
@@ -583 +584 @@
         local_flags = process_options(argc, argv, local_flags);
 
-        setup_logging("smbpasswd", True);
+        setup_logging("smbpasswd", DEBUG_STDERR);
 
         /*