diff options
| -rw-r--r-- | source3/lib/interfaces.c | 1 | ||||
| -rw-r--r-- | source3/lib/talloc/talloc.h | 1 | ||||
| -rw-r--r-- | source3/libaddns/dns.h | 3 | ||||
| -rw-r--r-- | source3/printing/print_cups.c | 1 | ||||
| -rw-r--r-- | source3/printing/print_iprint.c | 1 | ||||
| -rw-r--r-- | source3/smbd/oplock_irix.c | 1 | ||||
| -rw-r--r-- | source3/smbd/server.c | 2 | ||||
| -rw-r--r-- | source3/utils/status_profile.c | 3 |
8 files changed, 12 insertions, 1 deletions
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c index c48a8d4d360..839cab1286c 100644 --- a/source3/lib/interfaces.c +++ b/source3/lib/interfaces.c @@ -362,6 +362,7 @@ static int iface_comp(struct iface_struct *i1, struct iface_struct *i2) return r; } +int get_interfaces(struct iface_struct *ifaces, int max_interfaces); /* this wrapper is used to remove duplicates from the interface list generated above */ int get_interfaces(struct iface_struct *ifaces, int max_interfaces) diff --git a/source3/lib/talloc/talloc.h b/source3/lib/talloc/talloc.h index 8b17eec03ab..27d7d2c423f 100644 --- a/source3/lib/talloc/talloc.h +++ b/source3/lib/talloc/talloc.h @@ -123,6 +123,7 @@ void *talloc_named_const(const void *context, size_t size, const char *name); const char *talloc_get_name(const void *ptr); void *talloc_check_name(const void *ptr, const char *name); void *talloc_parent(const void *ptr); +const char *talloc_parent_name(const void *context); void *talloc_init(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2); int talloc_free(void *ptr); void talloc_free_children(void *ptr); diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h index 51af9180d15..a8673563ae7 100644 --- a/source3/libaddns/dns.h +++ b/source3/libaddns/dns.h @@ -405,6 +405,9 @@ DNS_ERROR dns_create_name_in_use_record(TALLOC_CTX *mem_ctx, const char *name, const in_addr_t *ip, struct dns_rrec **prec); +DNS_ERROR dns_create_name_not_in_use_record(TALLOC_CTX *mem_ctx, + const char *name, uint32 type, + struct dns_rrec **prec); DNS_ERROR dns_create_delete_record(TALLOC_CTX *mem_ctx, const char *name, uint16 type, uint16 r_class, struct dns_rrec **prec); diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index a5518764897..138f58d0c8c 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -1201,5 +1201,6 @@ struct printif cups_printif = #else /* this keeps fussy compilers happy */ + void print_cups_dummy(void); void print_cups_dummy(void) {} #endif /* HAVE_CUPS */ diff --git a/source3/printing/print_iprint.c b/source3/printing/print_iprint.c index 3eb231c2eba..29cb69087fa 100644 --- a/source3/printing/print_iprint.c +++ b/source3/printing/print_iprint.c @@ -1235,5 +1235,6 @@ struct printif iprint_printif = #else /* this keeps fussy compilers happy */ + void print_iprint_dummy(void); void print_iprint_dummy(void) {} #endif /* HAVE_IPRINT */ diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index 248d9020283..b62975dd274 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/smbd/oplock_irix.c @@ -266,5 +266,6 @@ struct kernel_oplocks *irix_init_kernel_oplocks(void) return &koplocks; } #else + void oplock_irix_dummy(void); void oplock_irix_dummy(void) {} #endif /* HAVE_KERNEL_OPLOCKS_IRIX */ diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 593e2bfb12d..5ee9320fb36 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -786,7 +786,7 @@ static BOOL init_structs(void ) mkproto.h. Mixing $(builddir) and $(srcdir) source files in the current prototype generation system is too complicated. */ -void build_options(BOOL screen); +extern void build_options(BOOL screen); int main(int argc,const char *argv[]) { diff --git a/source3/utils/status_profile.c b/source3/utils/status_profile.c index 811279b3a4c..10084e6fe5d 100644 --- a/source3/utils/status_profile.c +++ b/source3/utils/status_profile.c @@ -21,6 +21,9 @@ #include "includes.h" +BOOL status_profile_dump(BOOL be_verbose); +BOOL status_profile_rates(BOOL be_verbose); + #ifdef WITH_PROFILE static void profile_separator(const char * title) { |