diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/Makefile.in | 5 | ||||
| -rw-r--r-- | source/VERSION | 2 | ||||
| -rw-r--r-- | source/lib/util.c | 7 | ||||
| -rw-r--r-- | source/rpc_client/cli_spoolss.c | 52 | ||||
| -rw-r--r-- | source/rpc_parse/parse_spoolss.c | 30 | ||||
| -rw-r--r-- | source/rpcclient/cmd_spoolss.c | 76 | ||||
| -rw-r--r-- | source/smbd/dosmode.c | 4 | ||||
| -rw-r--r-- | source/smbd/lanman.c | 6 | ||||
| -rw-r--r-- | source/utils/testparm.c | 2 |
9 files changed, 166 insertions, 18 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 370017c3ada..0b39fd3dce8 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -472,7 +472,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PARAM_OBJ) $(PASSDB_OBJ) $(LIBSAMBA_OBJ) \ $(UBIQX_OBJ) $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(SECRETS_OBJ) \ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(DUMMYROOT_OBJ) -SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ) $(SECRETS_OBJ) +SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ) RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \ rpcclient/cmd_samr.o rpcclient/cmd_spoolss.o \ @@ -508,7 +508,8 @@ LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \ libsmb/libsmb_cache.o \ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(UBIQX_OBJ) \ - $(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_GET_SET_OBJ) + $(LIBMSRPC_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_GET_SET_OBJ) \ + $(SECRETS_OBJ) # This shared library is intended for linking with unit test programs # to test Samba internals. It's called libbigballofmud.so to diff --git a/source/VERSION b/source/VERSION index 9cb06979bc7..90dc23b001c 100644 --- a/source/VERSION +++ b/source/VERSION @@ -19,7 +19,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=8 +SAMBA_VERSION_RELEASE=9 ######################################################## # For 'pre' releases the version will be # diff --git a/source/lib/util.c b/source/lib/util.c index 89cf1bfa021..feb03fe4395 100644 --- a/source/lib/util.c +++ b/source/lib/util.c @@ -1747,7 +1747,12 @@ BOOL is_myname_or_ipaddr(const char *s) if (is_myname(servername)) return True; - + + /* check for loopback */ + + if (strequal(servername, "localhost")) + return True; + /* maybe it's my dns name */ if ( get_mydnsfullname( dnsname ) ) diff --git a/source/rpc_client/cli_spoolss.c b/source/rpc_client/cli_spoolss.c index 5303f83bf9c..dc693eb02cf 100644 --- a/source/rpc_client/cli_spoolss.c +++ b/source/rpc_client/cli_spoolss.c @@ -1083,6 +1083,58 @@ WERROR cli_spoolss_addprinterex (struct cli_state *cli, TALLOC_CTX *mem_ctx, return result; } +/********************************************************************** + * Delete a Printer Driver from the server (DOES remove + * the driver files) + */ +WERROR cli_spoolss_deleteprinterdriverex(struct cli_state *cli, + TALLOC_CTX *mem_ctx, const char *arch, + const char *driver, uint32 version) +{ + prs_struct qbuf, rbuf; + SPOOL_Q_DELETEPRINTERDRIVEREX q; + SPOOL_R_DELETEPRINTERDRIVEREX r; + WERROR result = W_ERROR(ERRgeneral); + fstring server; + + ZERO_STRUCT(q); + ZERO_STRUCT(r); + + + /* Initialise input parameters */ + prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL); + prs_init(&rbuf, 0, mem_ctx, UNMARSHALL); + + slprintf(server, sizeof(fstring)-1, "\\\\%s", cli->desthost); + strupper_m(server); + + /* Write the request */ + make_spoolss_q_deleteprinterdriverex(mem_ctx, &q, server, arch, driver, version); + + /* Marshall data and send request */ + + if (!spoolss_io_q_deleteprinterdriverex ("", &q, &qbuf, 0) + || !rpc_api_pipe_req (cli,SPOOLSS_DELETEPRINTERDRIVEREX , &qbuf, &rbuf)) + { + goto done; + } + + /* Unmarshall response */ + + if (!spoolss_io_r_deleteprinterdriverex ("", &r, &rbuf, 0)) + goto done; + + /* Return output parameters */ + + result = r.status; + +done: + prs_mem_free(&qbuf); + prs_mem_free(&rbuf); + + return result; +} + /********************************************************************************* Win32 API - DeltePrinterDriver() ********************************************************************************/ diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c index 2b2038d16ac..6362dcf0f1d 100644 --- a/source/rpc_parse/parse_spoolss.c +++ b/source/rpc_parse/parse_spoolss.c @@ -1221,6 +1221,36 @@ BOOL spoolss_io_r_open_printer_ex(const char *desc, SPOOL_R_OPEN_PRINTER_EX *r_u /******************************************************************* * init a structure. ********************************************************************/ +BOOL make_spoolss_q_deleteprinterdriverex( TALLOC_CTX *mem_ctx, + SPOOL_Q_DELETEPRINTERDRIVEREX *q_u, + const char *server, + const char* arch, + const char* driver, + uint32 version) +{ + DEBUG(5,("make_spoolss_q_deleteprinterdriverex\n")); + + q_u->server_ptr = (server!=NULL)?1:0; + q_u->delete_flags = DPD_DELETE_UNUSED_FILES; + + /* these must be NULL terminated or else NT4 will + complain about invalid parameters --jerry */ + init_unistr2(&q_u->server, server, UNI_STR_TERMINATE); + init_unistr2(&q_u->arch, arch, UNI_STR_TERMINATE); + init_unistr2(&q_u->driver, driver, UNI_STR_TERMINATE); + + if (version >= 0) { + q_u->delete_flags |= DPD_DELETE_SPECIFIC_VERSION; + q_u->version = version; + } + + return True; +} + + +/******************************************************************* + * init a structure. + ********************************************************************/ BOOL make_spoolss_q_deleteprinterdriver( TALLOC_CTX *mem_ctx, SPOOL_Q_DELETEPRINTERDRIVER *q_u, diff --git a/source/rpcclient/cmd_spoolss.c b/source/rpcclient/cmd_spoolss.c index a9882d799f8..0e17029a12c 100644 --- a/source/rpcclient/cmd_spoolss.c +++ b/source/rpcclient/cmd_spoolss.c @@ -521,7 +521,7 @@ static WERROR cmd_spoolss_setprinter(struct cli_state *cli, slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost); strupper_m(servername); - fstrcpy(printername, argv[1]); + slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]); fstrcpy(user, cli->user_name); /* get a printer handle */ @@ -591,7 +591,7 @@ static WERROR cmd_spoolss_setprintername(struct cli_state *cli, slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost); strupper_m(servername); - fstrcpy(printername, argv[1]); + slprintf(printername, sizeof(printername)-1, "%s\\%s", servername, argv[1]); fstrcpy(user, cli->user_name); /* get a printer handle */ @@ -1036,7 +1036,7 @@ static WERROR cmd_spoolss_getdriver(struct cli_state *cli, slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost); strupper_m(servername); fstrcpy(user, cli->user_name); - fstrcpy(printername, argv[1]); + slprintf(printername, sizeof(servername)-1, "%s\\%s", servername, argv[1]); if (argc == 3) info_level = atoi(argv[2]); @@ -1545,6 +1545,61 @@ done: } +static WERROR cmd_spoolss_deletedriverex(struct cli_state *cli, + TALLOC_CTX *mem_ctx, + int argc, const char **argv) +{ + WERROR result, ret = WERR_UNKNOWN_PRINTER_DRIVER; + + int i; + int vers = -1; + + const char *arch = NULL; + + /* parse the command arguements */ + if (argc < 2 || argc > 4) { + printf ("Usage: %s <driver> [arch] [version]\n", argv[0]); + return WERR_OK; + } + + if (argc >= 3) + arch = argv[2]; + if (argc == 4) + vers = atoi (argv[3]); + + + /* delete the driver for all architectures */ + for (i=0; archi_table[i].long_archi; i++) { + + if (arch && !strequal( archi_table[i].long_archi, arch)) + continue; + + if (vers >= 0 && archi_table[i].version != vers) + continue; + + /* make the call to remove the driver */ + result = cli_spoolss_deleteprinterdriverex( + cli, mem_ctx, archi_table[i].long_archi, argv[1], archi_table[i].version); + + if ( !W_ERROR_IS_OK(result) ) + { + if ( !W_ERROR_EQUAL(result, WERR_UNKNOWN_PRINTER_DRIVER) ) { + printf ("Failed to remove driver %s for arch [%s] (version: %d): %s\n", + argv[1], archi_table[i].long_archi, archi_table[i].version, dos_errstr(result)); + } + } + else + { + printf ("Driver %s and files removed for arch [%s] (version: %d).\n", argv[1], + archi_table[i].long_archi, archi_table[i].version); + ret = WERR_OK; + } + } + + return ret; +} + + static WERROR cmd_spoolss_deletedriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) @@ -2403,13 +2458,14 @@ struct cmd_set spoolss_commands[] = { { "SPOOLSS" }, { "adddriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterdriver, PI_SPOOLSS, "Add a print driver", "" }, - { "addprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex, PI_SPOOLSS, "Add a printer", "" }, + { "addprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addprinterex, PI_SPOOLSS, "Add a printer", "" }, { "deldriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriver, PI_SPOOLSS, "Delete a printer driver", "" }, + { "deldriverex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deletedriverex, PI_SPOOLSS, "Delete a printer driver with files", "" }, { "enumdata", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data, PI_SPOOLSS, "Enumerate printer data", "" }, - { "enumdataex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex, PI_SPOOLSS, "Enumerate printer data for a key", "" }, + { "enumdataex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_data_ex, PI_SPOOLSS, "Enumerate printer data for a key", "" }, { "enumkey", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printerkey, PI_SPOOLSS, "Enumerate printer keys", "" }, { "enumjobs", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_jobs, PI_SPOOLSS, "Enumerate print jobs", "" }, - { "enumports", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports, PI_SPOOLSS, "Enumerate printer ports", "" }, + { "enumports", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_ports, PI_SPOOLSS, "Enumerate printer ports", "" }, { "enumdrivers", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_drivers, PI_SPOOLSS, "Enumerate installed printer drivers", "" }, { "enumprinters", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_printers, PI_SPOOLSS, "Enumerate printers", "" }, { "getdata", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinterdata, PI_SPOOLSS, "Get print driver data", "" }, @@ -2418,15 +2474,15 @@ struct cmd_set spoolss_commands[] = { { "getdriverdir", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getdriverdir, PI_SPOOLSS, "Get print driver upload directory", "" }, { "getprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprinter, PI_SPOOLSS, "Get printer info", "" }, { "openprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_open_printer_ex, PI_SPOOLSS, "Open printer handle", "" }, - { "setdriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver, PI_SPOOLSS, "Set printer driver", "" }, + { "setdriver", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setdriver, PI_SPOOLSS, "Set printer driver", "" }, { "getprintprocdir", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getprintprocdir, PI_SPOOLSS, "Get print processor directory", "" }, { "addform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_addform, PI_SPOOLSS, "Add form", "" }, { "setform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setform, PI_SPOOLSS, "Set form", "" }, { "getform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_getform, PI_SPOOLSS, "Get form", "" }, - { "deleteform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform, PI_SPOOLSS, "Delete form", "" }, + { "deleteform", RPC_RTYPE_WERROR, NULL, cmd_spoolss_deleteform, PI_SPOOLSS, "Delete form", "" }, { "enumforms", RPC_RTYPE_WERROR, NULL, cmd_spoolss_enum_forms, PI_SPOOLSS, "Enumerate forms", "" }, - { "setprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter, PI_SPOOLSS, "Set printer comment", "" }, - { "setprintername", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername, PI_SPOOLSS, "Set printername", "" }, + { "setprinter", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinter, PI_SPOOLSS, "Set printer comment", "" }, + { "setprintername", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprintername, PI_SPOOLSS, "Set printername", "" }, { "setprinterdata", RPC_RTYPE_WERROR, NULL, cmd_spoolss_setprinterdata, PI_SPOOLSS, "Set REG_SZ printer data", "" }, { "rffpcnex", RPC_RTYPE_WERROR, NULL, cmd_spoolss_rffpcnex, PI_SPOOLSS, "Rffpcnex test", "" }, diff --git a/source/smbd/dosmode.c b/source/smbd/dosmode.c index 3a3a6e6fdb0..7199b3ebbf3 100644 --- a/source/smbd/dosmode.c +++ b/source/smbd/dosmode.c @@ -344,9 +344,7 @@ int file_set_dosmode(connection_struct *conn, const char *fname, uint32 dosmode, return(-1); } - if (!get_acl_group_bits(conn, fname, &st->st_mode)) { - return(-1); - } + get_acl_group_bits(conn, fname, &st->st_mode); if (S_ISDIR(st->st_mode)) dosmode |= aDIR; diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c index 610ee451201..e7aa05b54a6 100644 --- a/source/smbd/lanman.c +++ b/source/smbd/lanman.c @@ -2267,6 +2267,12 @@ static BOOL api_PrintJobInfo(connection_struct *conn,uint16 vuid,char *param,cha return False; *rparam_len = 4; *rparam = REALLOC(*rparam,*rparam_len); + + if ( (snum = lp_servicenumber(sharename)) == -1 ) { + DEBUG(0,("api_PrintJobInfo: unable to get service number from sharename [%s]\n", + sharename)); + return False; + } *rdata_len = 0; diff --git a/source/utils/testparm.c b/source/utils/testparm.c index d4dc22ec915..e1314078311 100644 --- a/source/utils/testparm.c +++ b/source/utils/testparm.c @@ -145,7 +145,7 @@ parameter.\n"); ret = 1; } else /* check if there's a %u parameter present */ - if(strstr_m(lp_passwd_chat(), "%u") == NULL) { + if(strstr_m(lp_passwd_program(), "%u") == NULL) { fprintf(stderr, "ERROR: the 'passwd program' (%s) requires a '%%u' parameter.\n", lp_passwd_program()); ret = 1; } |