diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-09 16:51:46 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-09 16:51:46 +0100 |
commit | 9b366d703210b493aa1389bbdd288a2b00958766 (patch) | |
tree | 12acaf89af2c6bd2610018d267e2d8030d9b4bd6 /source3/utils | |
parent | 6d139ca4680abcbda5110f2f0886aa038ff62088 (diff) | |
parent | 1dadf17be847e3f93b72988bcc7e8620a8d5908c (diff) | |
download | samba-9b366d703210b493aa1389bbdd288a2b00958766.tar.gz samba-9b366d703210b493aa1389bbdd288a2b00958766.tar.bz2 samba-9b366d703210b493aa1389bbdd288a2b00958766.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/utils')
-rw-r--r-- | source3/utils/net_conf.c | 6 | ||||
-rw-r--r-- | source3/utils/net_rpc_printer.c | 78 |
2 files changed, 42 insertions, 42 deletions
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c index 31e87ca804..0c2cd24fb2 100644 --- a/source3/utils/net_conf.c +++ b/source3/utils/net_conf.c @@ -576,12 +576,6 @@ static int net_conf_addshare(struct net_context *c, goto done; } - if (getpwnam(sharename)) { - d_fprintf(stderr, "ERROR: share name %s is already a valid " - "system user name.\n", sharename); - goto done; - } - if (strequal(sharename, GLOBAL_NAME)) { d_fprintf(stderr, "ERROR: 'global' is not a valid share name.\n"); diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c index c750e46b67..ad9be05798 100644 --- a/source3/utils/net_rpc_printer.c +++ b/source3/utils/net_rpc_printer.c @@ -1006,11 +1006,11 @@ static bool get_printer_info(struct rpc_pipe_client *pipe_hnd, return false; if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, ctr)) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL); return false; } - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL); *num_printers = 1; @@ -1242,7 +1242,7 @@ static NTSTATUS rpc_printer_publish_internals_args(struct rpc_pipe_client *pipe_ done: if (got_hnd) - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL); return nt_status; } @@ -1383,7 +1383,7 @@ NTSTATUS rpc_printer_publish_list_internals(struct net_context *c, done: if (got_hnd) - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL); return nt_status; } @@ -1522,12 +1522,12 @@ NTSTATUS rpc_printer_migrate_security_internals(struct net_context *c, /* close printer handles here */ if (got_hnd_src) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); got_hnd_src = false; } if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); got_hnd_dst = false; } @@ -1538,11 +1538,11 @@ NTSTATUS rpc_printer_migrate_security_internals(struct net_context *c, done: if (got_hnd_src) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); } if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); } if (cli_dst) { @@ -1668,8 +1668,10 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, for (f = 0; f < num_forms; f++) { - FORM form; + union spoolss_AddFormInfo info; + struct spoolss_AddFormInfo1 info1; fstring form_name; + NTSTATUS status; /* only migrate FORM_PRINTER types, according to jerry FORM_BUILTIN-types are hard-coded in samba */ @@ -1685,20 +1687,24 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, f, form_name, forms[f].flag); /* is there a more elegant way to do that ? */ - form.flags = FORM_PRINTER; - form.size_x = forms[f].width; - form.size_y = forms[f].length; - form.left = forms[f].left; - form.top = forms[f].top; - form.right = forms[f].right; - form.bottom = forms[f].bottom; + info1.flags = FORM_PRINTER; + info1.size.width = forms[f].width; + info1.size.height = forms[f].length; + info1.area.left = forms[f].left; + info1.area.top = forms[f].top; + info1.area.right = forms[f].right; + info1.area.bottom = forms[f].bottom; + info1.form_name = form_name; - init_unistr2(&form.name, form_name, UNI_STR_TERMINATE); + info.info1 = &info1; /* FIXME: there might be something wrong with samba's builtin-forms */ - result = rpccli_spoolss_addform(pipe_hnd_dst, mem_ctx, - &hnd_dst, 1, &form); + status = rpccli_spoolss_AddForm(pipe_hnd_dst, mem_ctx, + &hnd_dst, + 1, + info, + &result); if (!W_ERROR_IS_OK(result)) { d_printf("\tAddForm form %d: [%s] refused.\n", f, form_name); @@ -1711,12 +1717,12 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, /* close printer handles here */ if (got_hnd_src) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); got_hnd_src = false; } if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); got_hnd_dst = false; } } @@ -1726,10 +1732,10 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c, done: if (got_hnd_src) - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); if (got_hnd_dst) - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); if (cli_dst) { cli_shutdown(cli_dst); @@ -1933,13 +1939,13 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c, /* close dst */ if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); got_hnd_dst = false; } /* close src */ if (got_hnd_src) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); got_hnd_src = false; } } @@ -1949,10 +1955,10 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c, done: if (got_hnd_src) - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); if (got_hnd_dst) - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); if (cli_dst) { cli_shutdown(cli_dst); @@ -2067,7 +2073,7 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c, DEBUG(1,("printer already exists: %s\n", sharename)); /* close printer handle here - dst only, not got src yet. */ if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); got_hnd_dst = false; } continue; @@ -2103,12 +2109,12 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c, /* close printer handles here */ if (got_hnd_src) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); got_hnd_src = false; } if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); got_hnd_dst = false; } } @@ -2117,10 +2123,10 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c, done: if (got_hnd_src) - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); if (got_hnd_dst) - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); if (cli_dst) { cli_shutdown(cli_dst); @@ -2486,12 +2492,12 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c, /* close printer handles here */ if (got_hnd_src) { - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); got_hnd_src = false; } if (got_hnd_dst) { - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); got_hnd_dst = false; } @@ -2505,10 +2511,10 @@ done: SAFE_FREE(unc_name); if (got_hnd_src) - rpccli_spoolss_close_printer(pipe_hnd, mem_ctx, &hnd_src); + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd_src, NULL); if (got_hnd_dst) - rpccli_spoolss_close_printer(pipe_hnd_dst, mem_ctx, &hnd_dst); + rpccli_spoolss_ClosePrinter(pipe_hnd_dst, mem_ctx, &hnd_dst, NULL); if (cli_dst) { cli_shutdown(cli_dst); |