sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

Changes from APPLIANCE_HEAD:

Browse Source 
source/lib/smbpasswd.c
        - Only call load_interfaces() when doing a network related
          operation.  This means you can add, remove, enable or disable
          smbpasswd entries without a network.  Changing passwords always
          requires a network.
This commit is contained in:
David O'Neill
-
parent fdf044c351
commit e2193c3a36
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/utils/smbpasswd.c
View File

@ -327,6 +327,12 @@ static int process_root(int argc, char *argv[])
usage(); usage();
} }
/* Only load interfaces if we are doing network operations. */
if (joining_domain || remote_machine) {
load_interfaces();
}
if(joining_domain) { if(joining_domain) {
if (argc != 0) if (argc != 0)
usage(); usage();
@ -506,11 +512,13 @@ static int process_nonroot(int argc, char *argv[])
* via a remote machine (even if that machine is * via a remote machine (even if that machine is
* localhost). * localhost).
*/ */
load_interfaces(); /* Delayed from main() */
if (remote_machine == NULL) { if (remote_machine == NULL) {
remote_machine = "127.0.0.1"; remote_machine = "127.0.0.1";
} }
if (remote_machine != NULL) { if (remote_machine != NULL) {
old_passwd = get_pass("Old SMB password:",stdin_passwd_get); old_passwd = get_pass("Old SMB password:",stdin_passwd_get);
} }
@ -585,7 +593,6 @@ int main(int argc, char **argv)
codepage_initialise(lp_client_code_page()); codepage_initialise(lp_client_code_page());
load_interfaces();
secrets_init(); secrets_init();
/* Check the effective uid - make sure we are not setuid */ /* Check the effective uid - make sure we are not setuid */