summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-11-21 00:16:28 +0000
committerJeremy Allison <jra@samba.org>1998-11-21 00:16:28 +0000
commita97baa50fdbf951cf3568b7068a7194f22642d52 (patch)
tree6bf8d6545f53eff145edc3d181c717c04fe71aad
parentab1ab1ce0d49e968bcbd37841df1a13a2cf42884 (diff)
downloadsamba-a97baa50fdbf951cf3568b7068a7194f22642d52.tar.gz
samba-a97baa50fdbf951cf3568b7068a7194f22642d52.tar.bz2
samba-a97baa50fdbf951cf3568b7068a7194f22642d52.zip
smbd/password.c: Added *SMBSERVER fix is name is too long.
web/swat.c: Changed '?' to help. Jeremy. (This used to be commit 631913ea856926a77304692c74a1bd27faead179)
-rw-r--r--source3/smbd/password.c10
-rw-r--r--source3/web/swat.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 9011b9b95e..683303ff87 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1000,7 +1000,15 @@ struct cli_state *server_cryptkey(void)
}
make_nmb_name(&calling, local_machine, 0x0 , scope);
- make_nmb_name(&called , desthost , 0x20, scope);
+
+ if(strlen(desthost) > 15)
+ {
+ DEBUG(1,("server_cryptkey: %s is too long for a password server NetBIOS \
+name, using *SMBSERVER for the connection.\n", desthost ));
+ make_nmb_name(&called , "*SMBSERVER", 0x20, scope);
+ }
+ else
+ make_nmb_name(&called , desthost , 0x20, scope);
if (!cli_session_request(cli, &calling, &called))
{
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 7004891f32..8c5ac782a3 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -163,7 +163,7 @@ static void show_parameter(int snum, struct parm_struct *parm)
ptr = lp_local_ptr(snum, ptr);
}
- printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\">?</A> %s</td><td>",
+ printf("<tr><td><A HREF=\"/swat/help/smb.conf.5.html#%s\">Help</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; %s</td><td>",
stripspace(parm->label), parm->label);
switch (parm->type) {