svn commit: samba r4971 - in trunk: examples/LDAP source/rpcclient

[jerry at samba.org]

Author: jerry
Date: 2005-01-24 20:48:13 +0000 (Mon, 24 Jan 2005)
New Revision: 4971

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

Log:
svn merge -r4964:4966 svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
Modified:
   trunk/examples/LDAP/samba.schema
   trunk/source/rpcclient/cmd_spoolss.c


Changeset:
Modified: trunk/examples/LDAP/samba.schema
===================================================================
--- trunk/examples/LDAP/samba.schema	2005-01-24 20:21:15 UTC (rev 4970)
+++ trunk/examples/LDAP/samba.schema	2005-01-24 20:48:13 UTC (rev 4971)
@@ -376,13 +376,13 @@
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
 
-attributetype ( 1.3.6.1.4.1.7165.2.1.50 NAME 'sambaPrivName' 
-	SUP name )
+##attributetype ( 1.3.6.1.4.1.7165.2.1.50 NAME 'sambaPrivName' 
+##	SUP name )
 
-attributetype ( 1.3.6.1.4.1.7165.2.1.52 NAME 'sambaPrivilegeList'
-	DESC 'Privileges List'
-	EQUALITY caseIgnoreIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
+##attributetype ( 1.3.6.1.4.1.7165.2.1.52 NAME 'sambaPrivilegeList'
+##	DESC 'Privileges List'
+##	EQUALITY caseIgnoreIA5Match
+##	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
 
 attributetype ( 1.3.6.1.4.1.7165.2.1.53 NAME 'sambaTrustFlags'
 	DESC 'Trust Password Flags'
@@ -483,10 +483,11 @@
 	      sambaStringListoption $ description ) )
 
 
-objectclass ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' SUP top AUXILIARY
-	DESC 'Samba Privilege'
-	MUST ( sambaSID )
-	MAY ( sambaPrivilegeList ) )
+## retired during privilege rewrite
+##objectclass ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' SUP top AUXILIARY
+##	DESC 'Samba Privilege'
+##	MUST ( sambaSID )
+##	MAY ( sambaPrivilegeList ) )
 
 objectclass ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaAccountPolicy' SUP top STRUCTURAL
 	DESC 'Samba Account Policy'

Modified: trunk/source/rpcclient/cmd_spoolss.c
===================================================================
--- trunk/source/rpcclient/cmd_spoolss.c	2005-01-24 20:21:15 UTC (rev 4970)
+++ trunk/source/rpcclient/cmd_spoolss.c	2005-01-24 20:48:13 UTC (rev 4971)
@@ -31,6 +31,13 @@
 	int	version;
 };
  
+/* The version int is used by getdrivers.  Note that
+   all architecture strings that support mutliple
+   versions must be grouped together since enumdrivers
+   uses this property to prevent issuing multiple 
+   enumdriver calls for the same arch */
+
+
 static const struct table_node archi_table[]= {
 
 	{"Windows 4.0",          "WIN40",	0 },
@@ -1134,6 +1141,11 @@
 	{
 		uint32 needed;
 
+		/* check to see if we already asked for this architecture string */
+
+		if ( i>0 && strequal(archi_table[i].long_archi, archi_table[i-1].long_archi) )
+			continue;
+
 		werror = cli_spoolss_enumprinterdrivers(
 			cli, mem_ctx, 0, &needed, info_level, 
 			archi_table[i].long_archi, &returned, &ctr);