summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-03-16 15:44:16 +0100
committerGünther Deschner <gd@samba.org>2009-03-17 11:14:54 +0100
commit4727e3fa9784b183d223cd0779b6748f9916a538 (patch)
tree4a6a06e907d036aab4b20509781ec30aaf9e2b72
parent67599539063ff1d797886ea4097c59760e8ecbc5 (diff)
downloadsamba-4727e3fa9784b183d223cd0779b6748f9916a538.tar.gz
samba-4727e3fa9784b183d223cd0779b6748f9916a538.tar.bz2
samba-4727e3fa9784b183d223cd0779b6748f9916a538.zip
s4-spoolss: use winreg_Type for GetPrinterData implementation.
Guenther
-rw-r--r--source4/ntptr/simple_ldb/ntptr_simple_ldb.c26
-rw-r--r--source4/rpc_server/spoolss/dcesrv_spoolss.c4
2 files changed, 15 insertions, 15 deletions
diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index f4ba6b7157..4ebbaaeffc 100644
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -127,43 +127,43 @@ static WERROR sptr_GetPrintServerData(struct ntptr_GenericHandle *server, TALLOC
{
struct dcerpc_server_info *server_info = lp_dcerpc_server_info(mem_ctx, server->ntptr->lp_ctx);
if (strcmp("W3SvcInstalled", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 0;
return WERR_OK;
} else if (strcmp("BeepEnabled", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 0;
return WERR_OK;
} else if (strcmp("EventLog", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 0;
return WERR_OK;
} else if (strcmp("NetPopup", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 0;
return WERR_OK;
} else if (strcmp("NetPopupToComputer", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 0;
return WERR_OK;
} else if (strcmp("MajorVersion", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 3;
return WERR_OK;
} else if (strcmp("MinorVersion", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 0;
return WERR_OK;
} else if (strcmp("DefaultSpoolDirectory", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_STRING;
+ *r->out.type = REG_SZ;
r->out.data->string = "C:\\PRINTERS";
return WERR_OK;
} else if (strcmp("Architecture", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_STRING;
+ *r->out.type = REG_SZ;
r->out.data->string = SPOOLSS_ARCHITECTURE_NT_X86;
return WERR_OK;
} else if (strcmp("DsPresent", r->in.value_name) == 0) {
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_UINT32;
+ *r->out.type = REG_DWORD;
r->out.data->value = 1;
return WERR_OK;
} else if (strcmp("OSVersion", r->in.value_name) == 0) {
@@ -181,7 +181,7 @@ static WERROR sptr_GetPrintServerData(struct ntptr_GenericHandle *server, TALLOC
return WERR_GENERAL_FAILURE;
}
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_BINARY;
+ *r->out.type = REG_BINARY;
r->out.data->binary = blob;
return WERR_OK;
} else if (strcmp("OSVersionEx", r->in.value_name) == 0) {
@@ -201,13 +201,13 @@ static WERROR sptr_GetPrintServerData(struct ntptr_GenericHandle *server, TALLOC
return WERR_GENERAL_FAILURE;
}
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_BINARY;
+ *r->out.type = REG_BINARY;
r->out.data->binary = blob;
return WERR_OK;
} else if (strcmp("DNSMachineName", r->in.value_name) == 0) {
if (!lp_realm(server->ntptr->lp_ctx)) return WERR_INVALID_PARAM;
- *r->out.type = SPOOLSS_PRINTER_DATA_TYPE_STRING;
+ *r->out.type = REG_SZ;
r->out.data->string = talloc_asprintf(mem_ctx, "%s.%s",
lp_netbios_name(server->ntptr->lp_ctx),
lp_realm(server->ntptr->lp_ctx));
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index 820fb7d39e..7d14c0e502 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -580,7 +580,7 @@ static WERROR dcesrv_spoolss_GetPrinterData(struct dcesrv_call_state *dce_call,
if (!handle)
return WERR_BADFID;
- r->out.type = talloc_zero(mem_ctx, enum spoolss_PrinterDataType);
+ r->out.type = talloc_zero(mem_ctx, enum winreg_Type);
W_ERROR_HAVE_NO_MEMORY(r->out.type);
r->out.needed = talloc_zero(mem_ctx, uint32_t);
@@ -601,7 +601,7 @@ static WERROR dcesrv_spoolss_GetPrinterData(struct dcesrv_call_state *dce_call,
W_ERROR_NOT_OK_RETURN(status);
*r->out.needed = ndr_size_spoolss_PrinterData(r->out.data, *r->out.type, ic, 0);
- *r->out.type = SPOOLSS_BUFFER_OK(*r->out.type, SPOOLSS_PRINTER_DATA_TYPE_NULL);
+ *r->out.type = SPOOLSS_BUFFER_OK(*r->out.type, REG_NONE);
r->out.data = SPOOLSS_BUFFER_OK(r->out.data, r->out.data);
return SPOOLSS_BUFFER_OK(WERR_OK, WERR_MORE_DATA);
}