summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-18 13:06:47 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:13 +1000
commit9fcc617ff5a216cc4ff1a587786522d28d84c7f2 (patch)
tree7d8589355c0ae8f9a13e48238879706bd58d70c6 /source3/printing
parent128ae06a619b2c50cc9379053abb18277e814747 (diff)
downloadsamba-9fcc617ff5a216cc4ff1a587786522d28d84c7f2.tar.gz
samba-9fcc617ff5a216cc4ff1a587786522d28d84c7f2.tar.bz2
samba-9fcc617ff5a216cc4ff1a587786522d28d84c7f2.zip
s3-auth Use the common auth_session_info
This patch finally has the same structure being used to describe the authorization data of a user across the whole codebase. This will allow of our session handling to be accomplished with common code. Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/nt_printing.c20
-rw-r--r--source3/printing/nt_printing_ads.c12
-rw-r--r--source3/printing/nt_printing_migrate_internal.c2
-rw-r--r--source3/printing/printing.c18
4 files changed, 26 insertions, 26 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 7e2eaaf304..7d1dd9e4d0 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -574,7 +574,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
/****************************************************************************
Determine the correct cVersion associated with an architecture and driver
****************************************************************************/
-static uint32 get_correct_cversion(struct auth3_session_info *session_info,
+static uint32 get_correct_cversion(struct auth_session_info *session_info,
const char *architecture,
const char *driverpath_in,
WERROR *perr)
@@ -762,7 +762,7 @@ static uint32 get_correct_cversion(struct auth3_session_info *session_info,
} while (0);
static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
- struct auth3_session_info *session_info,
+ struct auth_session_info *session_info,
const char *architecture,
const char **driver_path,
const char **data_file,
@@ -835,7 +835,7 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
****************************************************************************/
WERROR clean_up_driver_struct(TALLOC_CTX *mem_ctx,
- struct auth3_session_info *session_info,
+ struct auth_session_info *session_info,
struct spoolss_AddDriverInfoCtr *r)
{
switch (r->level) {
@@ -954,7 +954,7 @@ static WERROR move_driver_file_to_download_area(TALLOC_CTX *mem_ctx,
return ret;
}
-WERROR move_driver_to_download_area(struct auth3_session_info *session_info,
+WERROR move_driver_to_download_area(struct auth_session_info *session_info,
struct spoolss_AddDriverInfoCtr *r)
{
struct spoolss_AddDriverInfo3 *driver;
@@ -1174,7 +1174,7 @@ WERROR move_driver_to_download_area(struct auth3_session_info *session_info,
****************************************************************************/
bool printer_driver_in_use(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
const struct spoolss_DriverInfo8 *r)
{
@@ -1413,7 +1413,7 @@ static bool trim_overlap_drv_files(TALLOC_CTX *mem_ctx,
****************************************************************************/
bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
struct spoolss_DriverInfo8 *info)
{
@@ -1516,7 +1516,7 @@ static NTSTATUS driver_unlink_internals(connection_struct *conn,
this.
****************************************************************************/
-bool delete_driver_files(const struct auth3_session_info *session_info,
+bool delete_driver_files(const struct auth_session_info *session_info,
const struct spoolss_DriverInfo8 *r)
{
int i = 0;
@@ -1721,7 +1721,7 @@ void map_job_permissions(struct security_descriptor *sd)
3) "printer admins" (may result in numerous calls to winbind)
****************************************************************************/
-bool print_access_check(const struct auth3_session_info *session_info,
+bool print_access_check(const struct auth_session_info *session_info,
struct messaging_context *msg_ctx, int snum,
int access_type)
{
@@ -1823,7 +1823,7 @@ bool print_access_check(const struct auth3_session_info *session_info,
Check the time parameters allow a print operation.
*****************************************************************************/
-bool print_time_access_check(const struct auth3_session_info *session_info,
+bool print_time_access_check(const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
const char *servicename)
{
@@ -1861,7 +1861,7 @@ bool print_time_access_check(const struct auth3_session_info *session_info,
}
void nt_printer_remove(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
const char *printer)
{
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 3323380cf9..728fefbc44 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -39,7 +39,7 @@ static void store_printer_guid(struct messaging_context *msg_ctx,
const char *printer, struct GUID guid)
{
TALLOC_CTX *tmp_ctx;
- struct auth3_session_info *session_info = NULL;
+ struct auth_session_info *session_info = NULL;
const char *guid_str;
DATA_BLOB blob;
NTSTATUS status;
@@ -244,7 +244,7 @@ static WERROR nt_printer_unpublish_ads(ADS_STRUCT *ads,
***************************************************************************/
WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
struct spoolss_PrinterInfo2 *pinfo2,
int action)
@@ -326,7 +326,7 @@ WERROR check_published_printers(struct messaging_context *msg_ctx)
int snum;
int n_services = lp_numservices();
TALLOC_CTX *tmp_ctx = NULL;
- struct auth3_session_info *session_info = NULL;
+ struct auth_session_info *session_info = NULL;
struct spoolss_PrinterInfo2 *pinfo2;
NTSTATUS status;
WERROR result;
@@ -388,7 +388,7 @@ done:
}
bool is_printer_published(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
const char *servername, char *printer, struct GUID *guid,
struct spoolss_PrinterInfo2 **info2)
@@ -469,7 +469,7 @@ done:
}
#else
WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
struct spoolss_PrinterInfo2 *pinfo2,
int action)
@@ -483,7 +483,7 @@ WERROR check_published_printers(struct messaging_context *msg_ctx)
}
bool is_printer_published(TALLOC_CTX *mem_ctx,
- const struct auth3_session_info *session_info,
+ const struct auth_session_info *session_info,
struct messaging_context *msg_ctx,
const char *servername, char *printer, struct GUID *guid,
struct spoolss_PrinterInfo2 **info2)
diff --git a/source3/printing/nt_printing_migrate_internal.c b/source3/printing/nt_printing_migrate_internal.c
index 9147247da2..296d5a631d 100644
--- a/source3/printing/nt_printing_migrate_internal.c
+++ b/source3/printing/nt_printing_migrate_internal.c
@@ -190,7 +190,7 @@ bool nt_printing_tdb_migrate(struct messaging_context *msg_ctx)
bool drivers_exists = file_exist(drivers_path);
bool printers_exists = file_exist(printers_path);
bool forms_exists = file_exist(forms_path);
- struct auth3_session_info *session_info;
+ struct auth_session_info *session_info;
struct rpc_pipe_client *winreg_pipe = NULL;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
NTSTATUS status;
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 07aaea20c6..9dbd516940 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2243,7 +2243,7 @@ static bool print_job_delete1(struct tevent_context *ev,
Return true if the current user owns the print job.
****************************************************************************/
-static bool is_owner(const struct auth3_session_info *server_info,
+static bool is_owner(const struct auth_session_info *server_info,
const char *servicename,
uint32 jobid)
{
@@ -2259,7 +2259,7 @@ static bool is_owner(const struct auth3_session_info *server_info,
Delete a print job.
****************************************************************************/
-WERROR print_job_delete(const struct auth3_session_info *server_info,
+WERROR print_job_delete(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx,
int snum, uint32_t jobid)
{
@@ -2327,7 +2327,7 @@ pause, or resume print job. User name: %s. Printer name: %s.",
Pause a job.
****************************************************************************/
-bool print_job_pause(const struct auth3_session_info *server_info,
+bool print_job_pause(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx,
int snum, uint32 jobid, WERROR *errcode)
{
@@ -2392,7 +2392,7 @@ pause, or resume print job. User name: %s. Printer name: %s.",
Resume a job.
****************************************************************************/
-bool print_job_resume(const struct auth3_session_info *server_info,
+bool print_job_resume(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx,
int snum, uint32 jobid, WERROR *errcode)
{
@@ -2660,7 +2660,7 @@ static bool add_to_jobs_added(struct tdb_print_db *pdb, uint32 jobid)
Do all checks needed to determine if we can start a job.
***************************************************************************/
-static WERROR print_job_checks(const struct auth3_session_info *server_info,
+static WERROR print_job_checks(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx,
int snum, int *njobs)
{
@@ -2786,7 +2786,7 @@ static WERROR print_job_spool_file(int snum, uint32_t jobid,
Start spooling a job - return the jobid.
***************************************************************************/
-WERROR print_job_start(const struct auth3_session_info *server_info,
+WERROR print_job_start(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx,
const char *clientmachine,
int snum, const char *docname, const char *filename,
@@ -3245,7 +3245,7 @@ int print_queue_status(struct messaging_context *msg_ctx, int snum,
Pause a queue.
****************************************************************************/
-WERROR print_queue_pause(const struct auth3_session_info *server_info,
+WERROR print_queue_pause(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx, int snum)
{
int ret;
@@ -3282,7 +3282,7 @@ WERROR print_queue_pause(const struct auth3_session_info *server_info,
Resume a queue.
****************************************************************************/
-WERROR print_queue_resume(const struct auth3_session_info *server_info,
+WERROR print_queue_resume(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx, int snum)
{
int ret;
@@ -3319,7 +3319,7 @@ WERROR print_queue_resume(const struct auth3_session_info *server_info,
Purge a queue - implemented by deleting all jobs that we can delete.
****************************************************************************/
-WERROR print_queue_purge(const struct auth3_session_info *server_info,
+WERROR print_queue_purge(const struct auth_session_info *server_info,
struct messaging_context *msg_ctx, int snum)
{
print_queue_struct *queue;