diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 20:14:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 20:14:17 +0200 |
| commit | eba7f1032d79fe5dcbc1902e3af1087399f67a5a (patch) | |
| tree | 1dc910d68153243e1ab7a5c7e455a6e2daec5cc4 /source3/include/proto.h | |
| parent | b39b6099a44ef40fc79fc68c9df740e0ef722d19 (diff) | |
| parent | 9cf1a68977d56d342ca7dbe8f07c725221dc1148 (diff) | |
| download | samba-eba7f1032d79fe5dcbc1902e3af1087399f67a5a.tar.gz samba-eba7f1032d79fe5dcbc1902e3af1087399f67a5a.tar.xz samba-eba7f1032d79fe5dcbc1902e3af1087399f67a5a.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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index b1c4d2e5d9..2ccf3b15f7 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5824,7 +5824,7 @@ const char **lp_svcctl_list(void); char *lp_cups_options(int ); char *lp_cups_server(void); char *lp_iprint_server(void); -int lp_cups_timeout(void); +int lp_cups_connection_timeout(void); const char *lp_ctdbd_socket(void); const char **lp_cluster_addresses(void); bool lp_clustering(void); |