diff options
| author | Gerald Carter <jerry@samba.org> | 2002-10-01 18:26:00 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-10-01 18:26:00 +0000 |
| commit | 3de09e5cf1f667e410ee8b9516a956860ce7290f (patch) | |
| tree | 23ef9ca994deaf73928b6f015d8bffdbd4c80318 /source/rpc_server | |
| parent | c0ca286e36d49deba6c73690114b0d867cbfd63e (diff) | |
| download | samba-3de09e5cf1f667e410ee8b9516a956860ce7290f.tar.gz samba-3de09e5cf1f667e410ee8b9516a956860ce7290f.tar.xz samba-3de09e5cf1f667e410ee8b9516a956860ce7290f.zip | |
syncing up with HEAD. Seems to be a lot of differences creeping in
(i ignored the new SAMBA stuff, but the rest of this looks like it should
have been merged already).
Diffstat (limited to 'source/rpc_server')
| -rw-r--r-- | source/rpc_server/srv_samr_nt.c | 4 | ||||
| -rw-r--r-- | source/rpc_server/srv_spoolss_nt.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c index c5a2c545115..020a3c6aafd 100644 --- a/source/rpc_server/srv_samr_nt.c +++ b/source/rpc_server/srv_samr_nt.c @@ -894,7 +894,7 @@ static NTSTATUS get_group_alias_entries(TALLOC_CTX *ctx, DOMAIN_GRP **d_grp, DOM /* well-known aliases */ if (sid_equal(sid, &global_sid_Builtin) && !lp_hide_local_users()) { - enum_group_mapping(SID_NAME_ALIAS, &map, (int *)&num_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV); + enum_group_mapping(SID_NAME_WKN_GRP, &map, (int *)&num_entries, ENUM_ONLY_MAPPED, MAPPING_WITHOUT_PRIV); if (num_entries != 0) { *d_grp=(DOMAIN_GRP *)talloc_zero(ctx, num_entries*sizeof(DOMAIN_GRP)); @@ -1328,7 +1328,7 @@ NTSTATUS _samr_query_aliasinfo(pipes_struct *p, SAMR_Q_QUERY_ALIASINFO *q_u, SAM !sid_check_is_in_builtin(&sid)) return NT_STATUS_OBJECT_TYPE_MISMATCH; - if (!get_local_group_from_sid(sid, &map, MAPPING_WITHOUT_PRIV)) + if (!get_group_map_from_sid(sid, &map, MAPPING_WITHOUT_PRIV)) return NT_STATUS_NO_SUCH_ALIAS; switch (q_u->switch_level) { diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index e60a1d20638..f942a685a1e 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/rpc_server/srv_spoolss_nt.c @@ -313,11 +313,6 @@ static WERROR delete_printer_handle(pipes_struct *p, POLICY_HND *hnd) return WERR_BADFID; } - if (del_a_printer(Printer->dev.handlename) != 0) { - DEBUG(3,("Error deleting printer %s\n", Printer->dev.handlename)); - return WERR_BADFID; - } - /* * It turns out that Windows allows delete printer on a handle * opened by an admin user, then used on a pipe handle created @@ -342,6 +337,11 @@ static WERROR delete_printer_handle(pipes_struct *p, POLICY_HND *hnd) } #endif + if (del_a_printer(Printer->dev.handlename) != 0) { + DEBUG(3,("Error deleting printer %s\n", Printer->dev.handlename)); + return WERR_BADFID; + } + if (*lp_deleteprinter_cmd()) { char *cmd = lp_deleteprinter_cmd(); |