summaryrefslogtreecommitdiff
path: root/source3/include/proto.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-31 13:59:56 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-31 13:59:56 +1100
commit046b7a35bed76f5d92a1e5f658478e25ffadf9ac (patch)
tree1500a19e70a4f90b5c3057d753aa1ae0a6e04788 /source3/include/proto.h
parent84547b8dba3c0cf4e20b3c50d9386081d475df6b (diff)
parent9be2e2fdce9f0823f428afd492c066eb5e097f59 (diff)
downloadsamba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.tar.gz
samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.tar.bz2
samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
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);