svn commit: samba r25029 - in branches/SAMBA_3_0_25/source/libads: .

[lmuelle at samba.org]

Author: lmuelle
Date: 2007-09-08 13:35:56 +0000 (Sat, 08 Sep 2007)
New Revision: 25029

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

Log:
Merge revision 24836 from 3_2*.  This is required by an outstanding patch.

Initialize some uninitialized variables.
This prevents a segfault when get_kdc_ip_string() is called
with sitename == NULL.

Modified:
   branches/SAMBA_3_0_25/source/libads/kerberos.c


Changeset:
Modified: branches/SAMBA_3_0_25/source/libads/kerberos.c
===================================================================
--- branches/SAMBA_3_0_25/source/libads/kerberos.c	2007-09-08 13:34:42 UTC (rev 25028)
+++ branches/SAMBA_3_0_25/source/libads/kerberos.c	2007-09-08 13:35:56 UTC (rev 25029)
@@ -490,9 +490,11 @@
 
 static char *get_kdc_ip_string(char *mem_ctx, const char *realm, const char *sitename, struct in_addr primary_ip)
 {
-	struct ip_service *ip_srv_site;
-	struct ip_service *ip_srv_nonsite;
-	int count_site, count_nonsite, i;
+	int i;
+	struct ip_service *ip_srv_site = NULL;
+	struct ip_service *ip_srv_nonsite = NULL;
+	int count_site = 0;
+	int count_nonsite = 0;
 	char *kdc_str = talloc_asprintf(mem_ctx, "\tkdc = %s\n",
 					inet_ntoa(primary_ip));