r7995: * privileges are local except when they're *not*

  printmig.exe assumes that the LUID of the SeBackupPrivlege
  on the target server matches the LUID of the privilege
  on the local client.  Even though an LUID is never guaranteed
  to be the same across reboots.  How *awful*!  My cat could
  write better code! (more on my cat later....)

* Set the privelege LUID in the global PRIVS[] array

* Rename RegCreateKey() to RegCreateKeyEx() to better match MSDN

* Rename the unknown field in RegCreateKeyEx() to disposition
  (guess according to MSDN)

* Add the capability to define REG_TDB_ONLY for using the reg_db.c
  functions and stress the RegXXX() rpc functions.
(This used to be commit 0d6352da4800aabc04dfd7c65a6afe6af7cd2d4b)

1 files changed, 24 insertions, 31 deletions

diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c
index 30f2d74660..6fedb524d6 100644
--- a/source3/registry/reg_printing.c
+++ b/source3/registry/reg_printing.c
@@ -38,7 +38,6 @@ static const char *top_level_keys[MAX_TOP_LEVEL_KEYS] = {
 	"Forms",
 	"Printers" 
 };
-	
 
 /**********************************************************************
  It is safe to assume that every registry path passed into on of 
@@ -832,6 +831,7 @@ static int handle_printing_subpath( char *key, REGSUBKEY_CTR *subkeys, REGVAL_CT
 	return result;
 
 }
+
 /**********************************************************************
  Enumerate registry subkey names given a registry path.  
  Caller is responsible for freeing memory to **subkeys
@@ -840,7 +840,6 @@ static int handle_printing_subpath( char *key, REGSUBKEY_CTR *subkeys, REGVAL_CT
 static int printing_subkey_info( const char *key, REGSUBKEY_CTR *subkey_ctr )
 {
 	char 		*path;
-	BOOL		top_level = False;
 	int		num_subkeys = 0;
 	
 	DEBUG(10,("printing_subkey_info: key=>[%s]\n", key));
@@ -849,25 +848,22 @@ static int printing_subkey_info( const char *key, REGSUBKEY_CTR *subkey_ctr )
 	
 	/* check to see if we are dealing with the top level key */
 	
-	if ( !path )
-		top_level = True;
-		
-	if ( top_level ) {
-		/* check between the two top level keys here */
-		
-		if ( strequal( KEY_PRINTING, key ) ) {
-			regsubkey_ctr_addkey( subkey_ctr, "Environments" );
-			regsubkey_ctr_addkey( subkey_ctr, "Forms" );
-		}
-		else if ( strequal( KEY_PRINTING_2K, key ) ) {
-			regsubkey_ctr_addkey( subkey_ctr, "Printers" );
-		}
-	}
-	else
+	if ( path ) {
 		num_subkeys = handle_printing_subpath( path, subkey_ctr, NULL );
+		SAFE_FREE( path );
+		return num_subkeys;
+	}
 	
-	SAFE_FREE( path );
-	
+	/* handle top level keys here */
+		
+	if ( strequal( KEY_PRINTING, key ) ) {
+		regsubkey_ctr_addkey( subkey_ctr, "Environments" );
+		regsubkey_ctr_addkey( subkey_ctr, "Forms" );
+	}
+	else if ( strequal( KEY_PRINTING_2K, key ) ) {
+		regsubkey_ctr_addkey( subkey_ctr, "Printers" );
+	}
+
 	return num_subkeys;
 }
 
@@ -879,25 +875,22 @@ static int printing_subkey_info( const char *key, REGSUBKEY_CTR *subkey_ctr )
 static int printing_value_info( const char *key, REGVAL_CTR *val )
 {
 	char 		*path;
-	BOOL		top_level = False;
 	int		num_values = 0;
 	
 	DEBUG(10,("printing_value_info: key=>[%s]\n", key));
 	
 	path = trim_reg_path( key );
+		
+	if ( path ) {
+		num_values = handle_printing_subpath( path, NULL, val );
+		SAFE_FREE( path );
+		return num_values;
+	}
 	
-	/* check to see if we are dealing with the top level key */
-	
-	if ( !path )
-		top_level = True;
+	/* top level key */
 	
-	/* fill in values from the getprinterdata_printer_server() */
-	if ( top_level ) {
-		if ( strequal( key, KEY_PRINTING_PORTS ) ) 
-			num_values = fill_ports_values( val );
-	} else
-		num_values = handle_printing_subpath( path, NULL, val );
-		
+	if ( strequal( key, KEY_PRINTING_PORTS ) ) 
+		num_values = fill_ports_values( val );
 	
 	return num_values;
 }