smbd/password.c: Added *SMBSERVER fix is name is too long.

web/swat.c: Changed '?' to help.
Jeremy.

diff --git a/source/smbd/password.c b/source/smbd/password.c
index 9011b9b95e1e3f02cad07578c5836c719d9d9e8c..683303ff8742996d3398a994a3d242f9879e6239 100644 (file)
--- a/source/smbd/password.c
+++ b/source/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/source/web/swat.c b/source/web/swat.c
index 7004891f32f2bea0aea586c61039dd4b24bb05ff..8c5ac782a39bed69160249b36714a810a4fa77f7 100644 (file)
--- a/source/web/swat.c
+++ b/source/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) {