svn commit: samba r26449 - in branches/SAMBA_4_0: . source/auth/kerberos source/param

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-14 01:46:25 +0000 (Fri, 14 Dec 2007)
New Revision: 26449

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

Log:
Support configuration without a known configuration dir.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
   branches/SAMBA_4_0/source/param/util.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c	2007-12-14 01:26:25 UTC (rev 26448)
+++ branches/SAMBA_4_0/source/auth/kerberos/krb5_init_context.c	2007-12-14 01:46:25 UTC (rev 26449)
@@ -403,7 +403,7 @@
 	}
 		
 	/* Use our local krb5.conf file by default */
-	ret = krb5_prepend_config_files_default(config_file, &config_files);
+	ret = krb5_prepend_config_files_default(config_file == NULL?"":config_file, &config_files);
 	if (ret) {
 		DEBUG(1,("krb5_prepend_config_files_default failed (%s)\n", 
 			 smb_get_krb5_error_message((*smb_krb5_context)->krb5_context, ret, tmp_ctx)));

Modified: branches/SAMBA_4_0/source/param/util.c
===================================================================
--- branches/SAMBA_4_0/source/param/util.c	2007-12-14 01:26:25 UTC (rev 26448)
+++ branches/SAMBA_4_0/source/param/util.c	2007-12-14 01:46:25 UTC (rev 26449)
@@ -106,6 +106,9 @@
 {
 	char *fname, *config_dir, *p;
 	config_dir = talloc_strdup(mem_ctx, lp_configfile(lp_ctx));
+	if (config_dir == NULL) {
+		return NULL;
+	}
 	p = strrchr(config_dir, '/');
 	if (p == NULL) {
 		return NULL;