summaryrefslogtreecommitdiff
path: root/source3/printing
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2006-12-12 17:38:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:26 -0500
commit791f48f167de339c8ae371e5c80706511fd10018 (patch)
treede938796cdcc79502b4c8257b9239e5f5070051f /source3/printing
parent243b462b094f80d89020bdad78a531a857281bad (diff)
downloadsamba-791f48f167de339c8ae371e5c80706511fd10018.tar.gz
samba-791f48f167de339c8ae371e5c80706511fd10018.tar.bz2
samba-791f48f167de339c8ae371e5c80706511fd10018.zip
r20124: clean up nested extern declaration warnings
(This used to be commit ac3eb7813e33b9a2e78c9158433f7ed62c3b62bb)
Diffstat (limited to 'source3/printing')
-rw-r--r--source3/printing/print_generic.c5
-rw-r--r--source3/printing/printing.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index aef4e50bfa..1e55f712c5 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -21,6 +21,8 @@
#include "includes.h"
#include "printing.h"
+extern struct current_user current_user;
+extern userdom_struct current_user_info;
/****************************************************************************
run a given print command
@@ -30,9 +32,6 @@ for local substitution strings
static int print_run_command(int snum, const char* printername, BOOL do_sub,
const char *command, int *outfd, ...)
{
- extern struct current_user current_user;
- extern userdom_struct current_user_info;
-
pstring syscmd;
char *arg;
int ret;
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0d9ae02545..2f1d123a20 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -25,6 +25,8 @@
extern SIG_ATOMIC_T got_sig_term;
extern SIG_ATOMIC_T reload_after_sighup;
+extern struct current_user current_user;
+extern userdom_struct current_user_info;
/* Current printer interface */
static BOOL remove_from_jobs_changed(const char* sharename, uint32 jobid);
@@ -1438,8 +1440,6 @@ update the internal database from the system print queue for a queue
static void print_queue_update(int snum, BOOL force)
{
- extern struct current_user current_user;
- extern userdom_struct current_user_info;
fstring key;
fstring sharename;
pstring lpqcommand, lprmcommand;