summaryrefslogtreecommitdiff
path: root/source3/include/proto.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-31 15:53:17 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-31 15:53:17 +1100
commit15e6def45d528b10f9ac2ecb917ff13ca6187711 (patch)
treeb085d7bb56cb8fc1293ecaf71108e223b74e703d /source3/include/proto.h
parent631e688c821b78d09d77f5940074800525c554aa (diff)
parent79b7ba9b106791958cc42d68b11d9dea2a77f6f3 (diff)
downloadsamba-15e6def45d528b10f9ac2ecb917ff13ca6187711.tar.gz
samba-15e6def45d528b10f9ac2ecb917ff13ca6187711.tar.bz2
samba-15e6def45d528b10f9ac2ecb917ff13ca6187711.zip
Merge branch 'master' into wspp-schema
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r--source3/include/proto.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 77be0aba09..2e76764e01 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4125,6 +4125,7 @@ const char **lp_admin_users(int );
const char **lp_svcctl_list(void);
char *lp_cups_options(int );
char *lp_cups_server(void);
+int lp_cups_encrypt(void);
char *lp_iprint_server(void);
int lp_cups_connection_timeout(void);
const char *lp_ctdbd_socket(void);