diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-02 13:07:09 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-03-02 05:27:16 +0100 |
| commit | 19cfa3e604b5bb8ffa155182d6c24a2fe883e6da (patch) | |
| tree | ca5f689fa1b8a553a47fcceba82ced8292e688fe /source3 | |
| parent | ebe04fc652f78ccbf765d9afe1ecc67c5e302eed (diff) | |
| download | samba-19cfa3e604b5bb8ffa155182d6c24a2fe883e6da.tar.gz samba-19cfa3e604b5bb8ffa155182d6c24a2fe883e6da.tar.bz2 samba-19cfa3e604b5bb8ffa155182d6c24a2fe883e6da.zip | |
s3-rpcclient: Ensure interfaces are loaded after smb.conf
This ensures that the interfaces line in the smb.conf is honoured.
Andrew Bartlett
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index ff4354f818..43df6723fc 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -956,8 +956,6 @@ out_free: poptFreeContext(pc); - load_interfaces(); - if (!init_names()) { result = 1; goto done; @@ -968,6 +966,9 @@ out_free: if (!lp_load_global(get_dyn_CONFIGFILE())) fprintf(stderr, "Can't load %s\n", get_dyn_CONFIGFILE()); + /* We must load interfaces after we load the smb.conf */ + load_interfaces(); + /* * Get password * from stdin if necessary |