Thanks for this. I won't get around to testing this till next week.
SAMBA_LOGDIR in the Makefile should be changed to use ${VARBASE} instead of
${SYSCONFIGDIR}.
I had this change in a version I was once working on.
SAMBA_LOGDIR = ${SYSCONFDIR}/log/samba
I'll completed the RC scripts next week too. Been sitting here for a while
rotting...............
Ian McWilliam
________________________________________
From: [email protected] [[email protected]] on behalf of Jérémie
Courrèges-Anglas [[email protected]]
Sent: Friday, 19 June 2015 1:17 AM
To: OpenBSD ports
Cc: Ian McWilliam; [email protected]
Subject: Re: [update] samba-4.1.18
Oh, by the way: the print_sockaddr() functions in libc/asr and samba4
conflict, this should be resolved after the next libc crank. For those
who want to test this update right now:
Index: asr_debug.c
===================================================================
RCS file: /cvs/src/lib/libc/asr/asr_debug.c,v
retrieving revision 1.18
diff -u -p -r1.18 asr_debug.c
--- asr_debug.c 26 May 2015 19:28:57 -0000 1.18
+++ asr_debug.c 18 Jun 2015 11:38:26 -0000
@@ -219,7 +219,7 @@ asr_dump_packet(FILE *f, const void *dat
}
const char *
-print_sockaddr(const struct sockaddr *sa, char *buf, size_t len)
+asr_print_sockaddr(const struct sockaddr *sa, char *buf, size_t len)
{
char h[256];
int portno;
@@ -300,7 +300,7 @@ asr_dump_config(FILE *f, struct asr *a)
ac->ac_nstimeout,
ac->ac_nsretries);
for (i = 0; i < ac->ac_nscount; i++)
- fprintf(f, " %s\n", print_sockaddr(ac->ac_ns[i], buf,
+ fprintf(f, " %s\n", asr_print_sockaddr(ac->ac_ns[i], buf,
sizeof buf));
fprintf(f, "LOOKUP %s", ac->ac_db);
fprintf(f, "\n------------------------------------\n");
Index: asr_private.h
===================================================================
RCS file: /cvs/src/lib/libc/asr/asr_private.h,v
retrieving revision 1.30
diff -u -p -r1.30 asr_private.h
--- asr_private.h 4 Jun 2015 19:23:17 -0000 1.30
+++ asr_private.h 18 Jun 2015 11:38:06 -0000
@@ -342,7 +342,7 @@ struct asr_query *gethostbyaddr_async_ct
const char *asr_querystr(int);
const char *asr_statestr(int);
const char *asr_transitionstr(int);
-const char *print_sockaddr(const struct sockaddr *, char *, size_t);
+const char *asr_print_sockaddr(const struct sockaddr *, char *, size_t);
void asr_dump_config(FILE *, struct asr *);
void asr_dump_packet(FILE *, const void *, size_t);
Index: res_send_async.c
===================================================================
RCS file: /cvs/src/lib/libc/asr/res_send_async.c,v
retrieving revision 1.22
diff -u -p -r1.22 res_send_async.c
--- res_send_async.c 26 Mar 2014 18:13:15 -0000 1.22
+++ res_send_async.c 18 Jun 2015 11:38:40 -0000
@@ -426,7 +426,7 @@ udp_send(struct asr_query *as)
#endif
DPRINT("asr: [%p] connecting to %s UDP\n", as,
- print_sockaddr(AS_NS_SA(as), buf, sizeof buf));
+ asr_print_sockaddr(AS_NS_SA(as), buf, sizeof buf));
as->as_fd = sockaddr_connect(AS_NS_SA(as), SOCK_DGRAM);
if (as->as_fd == -1)
@@ -503,7 +503,7 @@ tcp_write(struct asr_query *as)
/* First try to connect if not already */
if (as->as_fd == -1) {
DPRINT("asr: [%p] connecting to %s TCP\n", as,
- print_sockaddr(AS_NS_SA(as), buf, sizeof buf));
+ asr_print_sockaddr(AS_NS_SA(as), buf, sizeof buf));
as->as_fd = sockaddr_connect(AS_NS_SA(as), SOCK_STREAM);
if (as->as_fd == -1)
return (-1); /* errno set */
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
