diff options
| author | Luke Leighton <lkcl@samba.org> | 2000-05-27 02:15:08 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 2000-05-27 02:15:08 +0000 |
| commit | 1e3c0ab29d178fe58add32672301ac497d43a3fe (patch) | |
| tree | cef83725c914edfb9f246a5c18494a3d2f556ff9 | |
| parent | f46c4fe876a0cabe7044ca30c17e6c217d618635 (diff) | |
| download | samba-1e3c0ab29d178fe58add32672301ac497d43a3fe.tar.gz samba-1e3c0ab29d178fe58add32672301ac497d43a3fe.tar.xz samba-1e3c0ab29d178fe58add32672301ac497d43a3fe.zip | |
bug-fix from tim (insure). dummy fn call for andrew to fill in.
| -rw-r--r-- | source/printing/nt_printing.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index 5742b8cbec2..d0005ffc1fb 100644 --- a/source/printing/nt_printing.c +++ b/source/printing/nt_printing.c @@ -832,7 +832,7 @@ static int unpack_specifics(NT_PRINTER_PARAM **list, char *buf, int buflen) *list = NULL; while (1) { - len += tdb_unpack(buf+len, buflen-len, "p", p); + len += tdb_unpack(buf+len, buflen-len, "p", &p); if (!p) break; len += tdb_unpack(buf+len, buflen-len, "fdB", @@ -874,6 +874,14 @@ static uint32 get_a_printer_2_default(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstrin info.devmode = (NT_DEVICEMODE *)memdup(&devmode, sizeof(devmode)); + /* + * put a better system here, please. + */ + info.secdesc.len = 0; /* convertperms_unix_to_sd(&sbuf, False, + sbuf.st_mode, + &info.secdesc.sec); */ + info.secdesc.max_len = info.secdesc.len; + *info_ptr = (NT_PRINTER_INFO_LEVEL_2 *)memdup(&info, sizeof(info)); if (! *info_ptr) return 2; @@ -924,6 +932,9 @@ static uint32 get_a_printer_2(NT_PRINTER_INFO_LEVEL_2 **info_ptr, fstring sharen info.parameters); len += unpack_devicemode(&info.devmode,dbuf.dptr+len, dbuf.dsize-len); +#if 0 + len += unpack_secdesc(&info.devmode,dbuf.dptr+len, dbuf.dsize-len); +#endif len += unpack_specifics(&info.specific,dbuf.dptr+len, dbuf.dsize-len); *info_ptr=memdup(&info, sizeof(info)); |