diff options
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rwxr-xr-x | source3/configure | 4 | ||||
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/include/config.h.in | 6 | ||||
| -rw-r--r-- | source3/include/proto.h | 48 | ||||
| -rw-r--r-- | source3/printing/dummy.in | 0 |
6 files changed, 31 insertions, 31 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 70af6f9b59..d79873f7e8 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -126,7 +126,7 @@ SMBD_OBJ1 = smbd/server.o smbd/chgpasswd.o smbd/connection.o \ smbd/message.o smbd/nttrans.o smbd/pipes.o smbd/predict.o \ smbd/quotas.o smbd/reply.o smbd/ssl.o smbd/trans2.o smbd/uid.o -PRINTING_OBJ = param/pcap.o smbd/print_svid.o smbd/printing.o +PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/printing.o SMBD_OBJ = $(SMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \ $(RPC_SERVER_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \ diff --git a/source3/configure b/source3/configure index b770f95376..93bc79aa1b 100755 --- a/source3/configure +++ b/source3/configure @@ -4702,7 +4702,7 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy rpc_parse/dummy script/dummy include/dummy codepages/dummy -libsmb/dummy bin/dummy include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +libsmb/dummy bin/dummy printing/dummy include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <<EOF @@ -4798,7 +4798,7 @@ cat >> $CONFIG_STATUS <<EOF CONFIG_FILES=\${CONFIG_FILES-"Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy rpc_parse/dummy script/dummy include/dummy codepages/dummy -libsmb/dummy bin/dummy"} +libsmb/dummy bin/dummy printing/dummy"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/source3/configure.in b/source3/configure.in index c2793baf2c..237de833ed 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -647,4 +647,4 @@ fi AC_OUTPUT(Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy rpc_parse/dummy script/dummy include/dummy codepages/dummy -libsmb/dummy bin/dummy) +libsmb/dummy bin/dummy printing/dummy) diff --git a/source3/include/config.h.in b/source3/include/config.h.in index d3968452c3..de5cd41544 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -304,6 +304,9 @@ /* Define if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H +/* Define if you have the <rpcsvc/ypclnt.h> header file. */ +#undef HAVE_RPCSVC_YPCLNT_H + /* Define if you have the <security/pam_appl.h> header file. */ #undef HAVE_SECURITY_PAM_APPL_H @@ -358,9 +361,6 @@ /* Define if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H -/* Define if you have the <rpcsvc/ypclnt.h> header file. */ -#undef HAVE_RPCSVC_YPCLNT_H - /* Define if you have the <sys/security.h> header file. */ #undef HAVE_SYS_SECURITY_H diff --git a/source3/include/proto.h b/source3/include/proto.h index 74e240cfa3..49d078b78a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1091,11 +1091,6 @@ BOOL pm_process( char *FileName, BOOL (*sfunc)(char *), BOOL (*pfunc)(char *, char *) ); -/*The following definitions come from param/pcap.c */ - -BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname); -void pcap_printer_fn(void (*fn)(char *, char *)); - /*The following definitions come from passdb/ldap.c */ struct passdb_ops *ldap_initialize_password_db(void); @@ -1177,6 +1172,30 @@ BOOL trust_password_delete( char *domain, char *name ); BOOL get_trust_account_password( unsigned char *ret_pwd, time_t *pass_last_set_time); BOOL set_trust_account_password( unsigned char *md4_new_pwd); +/*The following definitions come from printing/pcap.c */ + +BOOL pcap_printername_ok(char *pszPrintername, char *pszPrintcapname); +void pcap_printer_fn(void (*fn)(char *, char *)); + +/*The following definitions come from printing/print_svid.c */ + +void sysv_printer_fn(void (*fn)(char *, char *)); +int sysv_printername_ok(char *name); + +/*The following definitions come from printing/printing.c */ + +void lpq_reset(int snum); +void print_file(connection_struct *conn, files_struct *file); +int get_printqueue(int snum, + connection_struct *conn,print_queue_struct **queue, + print_status_struct *status); +void del_printqueue(connection_struct *conn,int snum,int jobid); +void status_printjob(connection_struct *conn,int snum,int jobid,int status); +int printjob_encode(int snum, int job); +void printjob_decode(int jobid, int *snum, int *job); +void status_printqueue(connection_struct *conn,int snum,int status); +void load_printers(void); + /*The following definitions come from rpc_client/cli_login.c */ BOOL cli_nt_setup_creds(struct cli_state *cli, unsigned char mach_pwd[16]); @@ -2008,25 +2027,6 @@ int read_predict(int fd,int offset,char *buf,char **ptr,int num); void do_read_prediction(void); void invalidate_read_prediction(int fd); -/*The following definitions come from smbd/print_svid.c */ - -void sysv_printer_fn(void (*fn)(char *, char *)); -int sysv_printername_ok(char *name); - -/*The following definitions come from smbd/printing.c */ - -void lpq_reset(int snum); -void print_file(connection_struct *conn, files_struct *file); -int get_printqueue(int snum, - connection_struct *conn,print_queue_struct **queue, - print_status_struct *status); -void del_printqueue(connection_struct *conn,int snum,int jobid); -void status_printjob(connection_struct *conn,int snum,int jobid,int status); -int printjob_encode(int snum, int job); -void printjob_decode(int jobid, int *snum, int *job); -void status_printqueue(connection_struct *conn,int snum,int status); -void load_printers(void); - /*The following definitions come from smbd/quotas.c */ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize); diff --git a/source3/printing/dummy.in b/source3/printing/dummy.in new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/source3/printing/dummy.in |