diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-02-21 10:25:52 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-22 16:20:10 +1100 |
| commit | 2e69e894566d32001120d76d7ba58cdacb56d279 (patch) | |
| tree | 2ac3ab5945d6bc9ed9ac4757c05dd8a72057e1ec /source3/smbd/server_reload.c | |
| parent | 985c7da604ac30e67ee4b5a829935074900d6f26 (diff) | |
| download | samba-2e69e894566d32001120d76d7ba58cdacb56d279.tar.gz samba-2e69e894566d32001120d76d7ba58cdacb56d279.tar.xz samba-2e69e894566d32001120d76d7ba58cdacb56d279.zip | |
s3-auth Rename auth_serversupplied_info varaiables: server_info -> session_info
These variables, of type struct auth_serversupplied_info were poorly
named when added into 2001, and in good consistant practice, this has
extended all over the codebase in the years since.
The structure is also not ideal for it's current purpose. Originally
intended to convey the results of the authentication modules, it
really describes all the essential attributes of a session. This
rename will reduce the volume of a future patch to replaced these with
a struct auth_session_info, with auth_serversupplied_info confined to
the lower levels of the auth subsystem, and then eliminated.
(The new structure will be the output of create_local_token(), and the
change in struct definition will ensure that this is always run, populating
local groups and privileges).
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd/server_reload.c')
| -rw-r--r-- | source3/smbd/server_reload.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index bdca29d0bf9..f60130bd11e 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -33,7 +33,7 @@ void reload_printers(struct tevent_context *ev, struct messaging_context *msg_ctx) { - struct auth_serversupplied_info *server_info = NULL; + struct auth_serversupplied_info *session_info = NULL; struct spoolss_PrinterInfo2 *pinfo2 = NULL; int snum; int n_services = lp_numservices(); @@ -45,10 +45,10 @@ void reload_printers(struct tevent_context *ev, SMB_ASSERT(pcap_cache_loaded()); DEBUG(10, ("reloading printer services from pcap cache\n")); - status = make_server_info_system(talloc_tos(), &server_info); + status = make_session_info_system(talloc_tos(), &session_info); if (!NT_STATUS_IS_OK(status)) { DEBUG(3, ("reload_printers: " - "Could not create system server_info\n")); + "Could not create system session_info\n")); /* can't remove stale printers before we * are fully initilized */ skip = true; @@ -65,18 +65,18 @@ void reload_printers(struct tevent_context *ev, if (!pcap_printername_ok(pname)) { DEBUG(3, ("removing stale printer %s\n", pname)); - if (is_printer_published(server_info, server_info, + if (is_printer_published(session_info, session_info, msg_ctx, NULL, lp_servicename(snum), NULL, &pinfo2)) { - nt_printer_publish(server_info, - server_info, + nt_printer_publish(session_info, + session_info, msg_ctx, pinfo2, DSPRINT_UNPUBLISH); TALLOC_FREE(pinfo2); } - nt_printer_remove(server_info, server_info, msg_ctx, + nt_printer_remove(session_info, session_info, msg_ctx, pname); lp_killservice(snum); } @@ -84,7 +84,7 @@ void reload_printers(struct tevent_context *ev, load_printers(ev, msg_ctx); - TALLOC_FREE(server_info); + TALLOC_FREE(session_info); } /**************************************************************************** |