svn commit: lorikeet r366 - in trunk/sangria/src: .
jerry at samba.org
jerry at samba.org
Mon Jul 4 14:59:48 GMT 2005
Author: jerry
Date: 2005-07-04 14:59:48 +0000 (Mon, 04 Jul 2005)
New Revision: 366
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=366
Log:
merge gd's fixes from SAMBA_3_0
Modified:
trunk/sangria/src/generate_parm_table.py
Changeset:
Modified: trunk/sangria/src/generate_parm_table.py
===================================================================
--- trunk/sangria/src/generate_parm_table.py 2005-07-04 12:43:30 UTC (rev 365)
+++ trunk/sangria/src/generate_parm_table.py 2005-07-04 14:59:48 UTC (rev 366)
@@ -57,7 +57,7 @@
FOOTER = """##### end of smbparm.y ##########################################
#################################################################"""
-TESTPARM = "/opt/src/samba-cvs/samba-3.0/source/bin/testparm"
+TESTPARM = "/usr/bin/testparm"
## fields in Samba's parameter table
displayName = 0
@@ -89,7 +89,7 @@
## First thing is to build the dictionary of parmeter names ##
## based on the output from testparm ##
-cmd = "/opt/samba/bin/testparm -s -v /dev/null"
+cmd = "/usr/bin/testparm -s -v /dev/null"
( status, testparm_output ) = commands.getstatusoutput( cmd )
if status:
sys.stderr.write( "Failed to execute testparm!\n%s\n" % testparm_output )
@@ -111,7 +111,8 @@
parts[0] = string.strip( parts[0] )
parts[1] = string.strip( parts[1] )
key = string.upper( string.join(string.split(parts[0]), "") )
- def_values[key] = parts[1]
+ new = parts[1].replace('\\', '\\\\')
+ def_values[key] = new
## open loadparm.c and get the entire list of parameters ##
## including synonums ##
@@ -153,6 +154,7 @@
key = string.upper( string.join(string.split(name), "") )
var_name = string.strip( parm[variable] )
+
## try to catch synonyms -- if the parameter was not reported ##
## by testparm, then save it and come back after we will out ##
## the variable list ##
More information about the samba-cvs
mailing list