s3:winbindd: add an explanatory comment to _wbint_Sids2UnixIDs()

[kai/samba.git] / source3 / utils / smbpasswd.c

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 1b68136c687e617328c1751660bad6042f6760e6..66c80da618e03b56887567578ec3596c3fef308c 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -17,10 +17,11 @@
  * this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
+#include "system/passwd.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/samr.h"
-
-extern bool AllowDebugChange;
+#include "../lib/util/util_pw.h"
+#include "passdb.h"
 
 /*
  * Next two lines needed for SunOS and don't
@@ -106,6 +107,7 @@ static int process_options(int argc, char **argv, int local_flags)
                        break;
                case 'c':
                        configfile = optarg;
+                       set_dyn_CONFIGFILE(optarg);
                        break;
                case 'a':
                        local_flags |= LOCAL_ADD_USER;
@@ -151,10 +153,10 @@ static int process_options(int argc, char **argv, int local_flags)
                        fstrcpy(ldap_secret, optarg);
                        break;
                case 'R':
-                       lp_set_name_resolve_order(optarg);
+                       lp_set_cmdline("name resolve order", optarg);
                        break;
                case 'D':
-                       DEBUGLEVEL = atoi(optarg);
+                       lp_set_cmdline("log level", optarg);
                        break;
                case 'U': {
                        got_username = True;
@@ -194,7 +196,7 @@ static int process_options(int argc, char **argv, int local_flags)
                usage();
        }
 
-       if (!lp_load(configfile,True,False,False,True)) {
+       if (!lp_load_global(configfile)) {
                fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
                        configfile);
                exit(1);
@@ -284,7 +286,7 @@ static bool store_ldap_admin_pw (char* pw)
        if (!secrets_init())
                return False;
 
-       return secrets_store_ldap_pw(lp_ldap_admin_dn(), pw);
+       return secrets_store_ldap_pw(lp_ldap_admin_dn(talloc_tos()), pw);
 }
 
 
@@ -299,7 +301,7 @@ static int process_root(int local_flags)
        char *old_passwd = NULL;
 
        if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) {
-               char *ldap_admin_dn = lp_ldap_admin_dn();
+               char *ldap_admin_dn = lp_ldap_admin_dn(talloc_tos());
                if ( ! *ldap_admin_dn ) {
                        DEBUG(0,("ERROR: 'ldap admin dn' not defined! Please check your smb.conf\n"));
                        goto done;
@@ -342,7 +344,7 @@ static int process_root(int local_flags)
                load_interfaces();
        }
 
-       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);
        } 
@@ -368,7 +370,11 @@ static int process_root(int local_flags)
                if (local_flags & LOCAL_ADD_USER) {
                        SAFE_FREE(new_passwd);
                        new_passwd = smb_xstrdup(user_name);
-                       strlower_m(new_passwd);
+                       if (!strlower_m(new_passwd)) {
+                               fprintf(stderr, "strlower_m %s failed\n",
+                                       new_passwd);
+                               exit(1);
+                       }
                }
 
                /*
@@ -377,7 +383,7 @@ static int process_root(int local_flags)
                 */
 
                slprintf(buf, sizeof(buf)-1, "%s$", user_name);
-               fstrcpy(user_name, buf);
+               strlcpy(user_name, buf, sizeof(user_name));
        } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
                static fstring buf;
 
@@ -394,7 +400,7 @@ static int process_root(int local_flags)
 
                /* prepare uppercased and '$' terminated username */
                slprintf(buf, sizeof(buf) - 1, "%s$", user_name);
-               fstrcpy(user_name, buf);
+               strlcpy(user_name, buf, sizeof(user_name));
 
        } else {
 
@@ -507,7 +513,7 @@ static int process_nonroot(int local_flags)
        }
 
        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);
                        TALLOC_FREE(pwd);
@@ -570,8 +576,6 @@ int main(int argc, char **argv)
        int local_flags = 0;
        int ret;
 
-       AllowDebugChange = False;
-
 #if defined(HAVE_SET_AUTH_PARAMETERS)
        set_auth_parameters(argc, argv);
 #endif /* HAVE_SET_AUTH_PARAMETERS */
@@ -584,7 +588,7 @@ int main(int argc, char **argv)
 
        local_flags = process_options(argc, argv, local_flags);
 
-       setup_logging("smbpasswd", True);
+       setup_logging("smbpasswd", DEBUG_STDERR);
 
        /*
         * Set the machine NETBIOS name if not already
@@ -602,10 +606,10 @@ int main(int argc, char **argv)
 
        if (local_flags & LOCAL_AM_ROOT) {
                secrets_init();
-               return process_root(local_flags);
-       } 
-
-       ret = process_nonroot(local_flags);
+               ret = process_root(local_flags);
+       } else {
+               ret = process_nonroot(local_flags);
+       }
        TALLOC_FREE(frame);
        return ret;
 }