summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-08-18 12:33:41 +0000
committerGerald Carter <jerry@samba.org>2002-08-18 12:33:41 +0000
commit11fadbee748a64535de47f7508e5764cc04fec70 (patch)
treea60952c0d48791fb83087444530f92fe6bb15925
parent50d224a898fa130460bba4009e18fb54b1390168 (diff)
downloadsamba-11fadbee748a64535de47f7508e5764cc04fec70.tar.gz
samba-11fadbee748a64535de47f7508e5764cc04fec70.tar.bz2
samba-11fadbee748a64535de47f7508e5764cc04fec70.zip
fix GetPrinterDataEx() to work with registry subkeys using a depth > 1
(This used to be commit 8799d4f7ccf3b3767c155d29f15cecd142d0db99)
-rw-r--r--source3/printing/nt_printing.c2
-rw-r--r--source3/registry/reg_frontend.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index d51d3bc1bb..6cfc9aac5a 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2626,7 +2626,7 @@ static int unpack_values(NT_PRINTER_DATA *printer_data, char *buf, int buflen)
* Should only be one '\' in the string returned.
*/
- str = strchr( string, '\\');
+ str = strrchr( string, '\\');
/* Put in "PrinterDriverData" is no key specified */
diff --git a/source3/registry/reg_frontend.c b/source3/registry/reg_frontend.c
index 994f03cf5a..f31f675997 100644
--- a/source3/registry/reg_frontend.c
+++ b/source3/registry/reg_frontend.c
@@ -332,7 +332,7 @@ REGISTRY_VALUE* regval_ctr_getvalue( REGVAL_CTR *ctr, char *name )
/* search for the value */
for ( i=0; i<ctr->num_values; i++ ) {
- if ( strequal( ctr->values[i]->valuename, name ) == 0)
+ if ( strequal( ctr->values[i]->valuename, name ) )
return ctr->values[i];
}