r15137: Refuse to join if our netbios name is longer than 15 chars. I think this is

sufficient to fix bug #3659.

Volker

diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 93d564bea0ee9f694a1ad5e9cc275bce168a1ecb..11e7ae02826a952117854d50c7a73f48e7e0a66e 100644 (file)
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -727,6 +727,12 @@ int net_ads_join(int argc, const char **argv)
                return -1;
        }
 
+       if (strlen(global_myname()) > 15) {
+               d_printf("Our netbios name can only be 15 chars long, \"%s\""
+                        " is %d chars long\n",
+                        global_myname(), strlen(global_myname()));
+               return -1;
+       }
 
        if (argc > 0) {
                org_unit = argv[0];

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index e8667cbf7be8d1ddcbc996a3a7b1cf8d0cd2d854..0060a39c3103c9fefed8314617426856d9cbc86f 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -395,6 +395,13 @@ int net_rpc_join(int argc, const char **argv)
                return -1;
        }
 
+       if (strlen(global_myname()) > 15) {
+               d_printf("Our netbios name can only be 15 chars long, \"%s\""
+                        " is %d chars long\n",
+                        global_myname(), strlen(global_myname()));
+               return -1;
+       }
+
        if ((net_rpc_perform_oldjoin(argc, argv) == 0))
                return 0;