summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-07-04 16:52:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:58:12 -0500
commit2427e00b1da0ccfaf2c075ec408fd0f822801880 (patch)
tree5cc1c7e0214df34e0f51fb4ec683e85850d2bd79
parent3ddc4877bdd7f1a1e28855dbd8dc5dbf16839f3e (diff)
downloadsamba-2427e00b1da0ccfaf2c075ec408fd0f822801880.tar.gz
samba-2427e00b1da0ccfaf2c075ec408fd0f822801880.tar.bz2
samba-2427e00b1da0ccfaf2c075ec408fd0f822801880.zip
r8152: * remove commented out structure
* use SAMBA_PRINTER_PORT_NAME in registry values for builtin printer port (This used to be commit 63bc03536b6d0622005448f0f7be2739e06a432a)
-rw-r--r--source3/include/nt_printing.h15
-rw-r--r--source3/registry/reg_db.c4
2 files changed, 2 insertions, 17 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index fa53e1d284..01835c999e 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -344,21 +344,6 @@ typedef struct
uint32 bottom;
} nt_forms_struct;
-/*
-typedef struct _form
-{
- uint32 flags;
- uint32 name_ptr;
- uint32 size_x;
- uint32 size_y;
- uint32 left;
- uint32 top;
- uint32 right;
- uint32 bottom;
- UNISTR2 name;
-} FORM;
-*/
-
#ifndef SAMBA_PRINTER_PORT_NAME
#define SAMBA_PRINTER_PORT_NAME "Samba Printer Port"
#endif
diff --git a/source3/registry/reg_db.c b/source3/registry/reg_db.c
index cfc8b854fc..bd17303a70 100644
--- a/source3/registry/reg_db.c
+++ b/source3/registry/reg_db.c
@@ -67,9 +67,9 @@ static struct builtin_regkey_value builtin_registry_values[] = {
{ "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion",
"SystemRoot", REG_SZ, { "c:\\Windows" } },
{ "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Ports",
- "Samba Printer Port", REG_SZ, { "" } },
+ SAMBA_PRINTER_PORT_NAME, REG_SZ, { "" } },
{ "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Print\\Printers",
- "DefaultSpoolDirectory", REG_SZ, { "c:\\windows\\system32\\spool\\printers" } },
+ "DefaultSpoolDirectory", REG_SZ, { "C:\\Windows\\System32\\Spool\\Printers" } },
{ NULL, NULL, 0, { NULL } }
};