summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1999-01-07 23:02:00 +0000
committerJeremy Allison <jra@samba.org>1999-01-07 23:02:00 +0000
commit80af517df6e1af23a3bc17b80f72517b06dc51e8 (patch)
tree5fac8eb4be019ff98a3f8dcaa0910beeb7b02e0f
parentd32fee0ba61539be9ddc90c9e3c6c489e9167362 (diff)
downloadsamba-80af517df6e1af23a3bc17b80f72517b06dc51e8.tar.gz
samba-80af517df6e1af23a3bc17b80f72517b06dc51e8.tar.xz
samba-80af517df6e1af23a3bc17b80f72517b06dc51e8.zip
nmbd/nmbd_incomingrequests.c: Split long debug message.
utils/smbpasswd.c: Added load_interfaces() to allow name resolution to work correctly for multihomed smb.confs. Jeremy.
-rw-r--r--source/nmbd/nmbd_incomingrequests.c3
-rw-r--r--source/utils/smbpasswd.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/source/nmbd/nmbd_incomingrequests.c b/source/nmbd/nmbd_incomingrequests.c
index 13fd5721061..7c46204445c 100644
--- a/source/nmbd/nmbd_incomingrequests.c
+++ b/source/nmbd/nmbd_incomingrequests.c
@@ -176,8 +176,9 @@ void process_name_refresh_request(struct subnet_record *subrec,
and send an error reply back.
*/
DEBUG(0,("process_name_refresh_request: unicast name registration request \
-received for name %s from IP %s on subnet %s. Error - should be sent to WINS server\n",
+received for name %s from IP %s on subnet %s.\n",
nmb_namestr(question), inet_ntoa(from_ip), subrec->subnet_name));
+ DEBUG(0,("Error - should be sent to WINS server\n"));
send_name_registration_response(FMT_ERR, 0, p);
return;
diff --git a/source/utils/smbpasswd.c b/source/utils/smbpasswd.c
index ea070ab1d11..daaf51672af 100644
--- a/source/utils/smbpasswd.c
+++ b/source/utils/smbpasswd.c
@@ -589,6 +589,8 @@ int main(int argc, char **argv)
codepage_initialise(lp_client_code_page());
+ load_interfaces();
+
/* Check the effective uid - make sure we are not setuid */
if ((geteuid() == (uid_t)0) && (getuid() != (uid_t)0)) {
fprintf(stderr, "smbpasswd must *NOT* be setuid root.\n");