summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-04-13 14:39:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:13 -0500
commit8ad3d8c9b065f3a2040beff801bdc9dceac868a8 (patch)
tree8c0763ba095ca5386b5b06ddb3f10a05d9a85dcf /source3/printing
parent142f5604b56240054f088dce4703c714b7065106 (diff)
downloadsamba-8ad3d8c9b065f3a2040beff801bdc9dceac868a8.tar.gz
samba-8ad3d8c9b065f3a2040beff801bdc9dceac868a8.tar.bz2
samba-8ad3d8c9b065f3a2040beff801bdc9dceac868a8.zip
r196: merging struct uuid from trunk
(This used to be commit 911a28361b9d8dd50597627f245ebfb57c6294fb)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/nt_printing.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 449b0e83ed..675794c4c2 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2,7 +2,7 @@
* Unix SMB/CIFS implementation.
* RPC Pipe client / server routines
* Copyright (C) Andrew Tridgell 1992-2000,
- * Copyright (C) Jean François Micouleau 1998-2000.
+ * Copyright (C) Jean François Micouleau 1998-2000.
* Copyright (C) Gerald Carter 2002-2003.
*
* This program is free software; you can redistribute it and/or modify
@@ -2166,7 +2166,7 @@ NT_DEVICEMODE *construct_nt_devicemode(const fstring default_devicename)
nt_devmode->mediatype = 0;
nt_devmode->dithertype = 0;
- /* non utilisés par un driver d'imprimante */
+ /* non utilisés par un driver d'imprimante */
nt_devmode->logpixels = 0;
nt_devmode->bitsperpel = 0;
nt_devmode->pelswidth = 0;
@@ -2576,7 +2576,8 @@ static BOOL map_nt_printer_info2_to_dsspooler(NT_PRINTER_INFO_LEVEL_2 *info2)
return True;
}
-static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, GUID guid)
+static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2,
+ struct uuid guid)
{
int i;
REGVAL_CTR *ctr=NULL;
@@ -2588,7 +2589,7 @@ static void store_printer_guid(NT_PRINTER_INFO_LEVEL_2 *info2, GUID guid)
regval_ctr_delvalue(ctr, "objectGUID");
regval_ctr_addvalue(ctr, "objectGUID", REG_BINARY,
- (char *) &guid, sizeof(GUID));
+ (char *) &guid, sizeof(struct uuid));
}
static WERROR publish_it(NT_PRINTER_INFO_LEVEL *printer)
@@ -2601,7 +2602,7 @@ static WERROR publish_it(NT_PRINTER_INFO_LEVEL *printer)
void *res = NULL;
ADS_STRUCT *ads;
const char *attrs[] = {"objectGUID", NULL};
- GUID guid;
+ struct uuid guid;
WERROR win_rc = WERR_OK;
ZERO_STRUCT(guid);
@@ -2785,7 +2786,8 @@ WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
return win_rc;
}
-BOOL is_printer_published(Printer_entry *print_hnd, int snum, GUID *guid)
+BOOL is_printer_published(Printer_entry *print_hnd, int snum,
+ struct uuid *guid)
{
NT_PRINTER_INFO_LEVEL *printer = NULL;
REGVAL_CTR *ctr;
@@ -2813,8 +2815,8 @@ BOOL is_printer_published(Printer_entry *print_hnd, int snum, GUID *guid)
return False;
}
- if (regval_size(guid_val) == sizeof(GUID))
- memcpy(guid, regval_data_p(guid_val), sizeof(GUID));
+ if (regval_size(guid_val) == sizeof(struct uuid))
+ memcpy(guid, regval_data_p(guid_val), sizeof(struct uuid));
return True;
}
@@ -2824,7 +2826,8 @@ WERROR nt_printer_publish(Printer_entry *print_hnd, int snum, int action)
{
return WERR_OK;
}
-BOOL is_printer_published(Printer_entry *print_hnd, int snum, GUID *guid)
+BOOL is_printer_published(Printer_entry *print_hnd, int snum,
+ struct uuid *guid)
{
return False;
}