svn commit: samba r25449 - in branches/SAMBA_4_0: . source/param source/script

jelmer at samba.org jelmer at samba.org
Mon Oct 1 19:46:26 GMT 2007


Author: jelmer
Date: 2007-10-01 19:46:00 +0000 (Mon, 01 Oct 2007)
New Revision: 25449

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

Log:
Add convenience function for opening the default smb.conf for openchange.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/script/mkproto.pl


Changeset:

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

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_4_0/source/param/loadparm.c	2007-10-01 19:30:27 UTC (rev 25448)
+++ branches/SAMBA_4_0/source/param/loadparm.c	2007-10-01 19:46:00 UTC (rev 25449)
@@ -2452,6 +2452,11 @@
 	return true;
 }
 
+_PUBLIC_ _DEPRECATED_ bool lp_load_default(void)
+{
+	return lp_load(dyn_CONFIGFILE);
+}
+
 /***************************************************************************
  Load the services array from the services file. Return True on success, 
  False on failure.

Modified: branches/SAMBA_4_0/source/script/mkproto.pl
===================================================================
--- branches/SAMBA_4_0/source/script/mkproto.pl	2007-10-01 19:30:27 UTC (rev 25448)
+++ branches/SAMBA_4_0/source/script/mkproto.pl	2007-10-01 19:46:00 UTC (rev 25449)
@@ -198,7 +198,7 @@
 		}
 
 		next unless ( $is_public || $line =~ /
-			      (_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*^(
+			      ^(_DEPRECATED_ |_NORETURN_ |_WARN_UNUSED_RESULT_ |_PURE_ )*(
 				  void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS|
 				  ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR|
 			      double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module|



More information about the samba-cvs mailing list