svn commit: samba r15137 - branches/SAMBA_3_0/source/utils trunk/source/utils

[vlendec at samba.org]

Author: vlendec
Date: 2006-04-19 15:43:48 +0000 (Wed, 19 Apr 2006)
New Revision: 15137

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15137

Log:
Refuse to join if our netbios name is longer than 15 chars. I think this is
sufficient to fix bug #3659.

Volker

Modified:
   branches/SAMBA_3_0/source/utils/net_ads.c
   branches/SAMBA_3_0/source/utils/net_rpc.c
   trunk/source/utils/net_ads.c
   trunk/source/utils/net_rpc.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_ads.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-19 15:38:43 UTC (rev 15136)
+++ branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-19 15:43:48 UTC (rev 15137)
@@ -727,6 +727,12 @@
 		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];

Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-19 15:38:43 UTC (rev 15136)
+++ branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-19 15:43:48 UTC (rev 15137)
@@ -395,6 +395,13 @@
 		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;
 	

Modified: trunk/source/utils/net_ads.c
===================================================================
--- trunk/source/utils/net_ads.c	2006-04-19 15:38:43 UTC (rev 15136)
+++ trunk/source/utils/net_ads.c	2006-04-19 15:43:48 UTC (rev 15137)
@@ -727,6 +727,12 @@
 		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];

Modified: trunk/source/utils/net_rpc.c
===================================================================
--- trunk/source/utils/net_rpc.c	2006-04-19 15:38:43 UTC (rev 15136)
+++ trunk/source/utils/net_rpc.c	2006-04-19 15:43:48 UTC (rev 15137)
@@ -395,6 +395,13 @@
 		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;