The branch, master has been updated via 8a9493f s4-dsdb: Add debug message if we have a ldb error string via 88c4687 idl: Rename "principle" to "principal_name" via 11970e6 ctdb-build: Add missing dependency on tdb via 9f94620 ctdb-common: Use documented names for protocol family in socket() via 9f8395c ctdb-common: Protocol argument must be in host order for socket() call from 6831ba3 s3:vfs:glusterfs: fix build after quota changes.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8a9493f92729ff6b5a25eafc64646628b2d826be Author: Andreas Schneider <a...@samba.org> Date: Mon Jan 25 16:39:59 2016 +0100 s4-dsdb: Add debug message if we have a ldb error string When trying to change the password with kpasswd, the KDC returns "Unspecified password quality failure". Because we do not get the ldb error which is e.g.: password is too young to change! This way at least the admin can find out what is going on. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Tue Feb 2 11:49:51 CET 2016 on sn-devel-144 commit 88c46879453a71ac5e5aff9bc3bbdb5d36b84a44 Author: Volker Lendecke <v...@samba.org> Date: Mon Feb 1 21:45:48 2016 +0100 idl: Rename "principle" to "principal_name" Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Guenther Deschner <g...@samba.org> commit 11970e6506ffc8050dd33a96c00ed682a897acd0 Author: Amitay Isaacs <ami...@gmail.com> Date: Thu Jan 28 23:45:10 2016 +1100 ctdb-build: Add missing dependency on tdb Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Volker Lendecke <v...@samba.org> commit 9f94620a308a3b17c1886c2c4807b34b8d5edacb Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Jan 29 00:06:18 2016 +1100 ctdb-common: Use documented names for protocol family in socket() Instead of using PF_*, use AF_*. https://bugzilla.samba.org/show_bug.cgi?id=11705 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Volker Lendecke <v...@samba.org> commit 9f8395cb7d49b63a82f75bf504f5f83920102b29 Author: Amitay Isaacs <ami...@gmail.com> Date: Fri Jan 29 00:05:26 2016 +1100 ctdb-common: Protocol argument must be in host order for socket() call BUG: https://bugzilla.samba.org/show_bug.cgi?id=11705 Signed-off-by: Amitay Isaacs <ami...@gmail.com> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: ctdb/common/system_aix.c | 4 ++-- ctdb/common/system_common.c | 2 +- ctdb/common/system_freebsd.c | 4 ++-- ctdb/common/system_gnu.c | 4 ++-- ctdb/common/system_kfreebsd.c | 4 ++-- ctdb/common/system_linux.c | 12 ++++++------ ctdb/tools/ctdb.c | 4 ++-- ctdb/utils/smnotify/smnotify.c | 6 +++--- ctdb/wscript | 2 +- librpc/idl/netlogon.idl | 2 +- source3/auth/server_info.c | 8 ++++---- source4/dsdb/common/util.c | 1 + source4/rpc_server/netlogon/dcerpc_netlogon.c | 7 ++++--- 13 files changed, 31 insertions(+), 29 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c index d323e5c..2d35a22 100644 --- a/ctdb/common/system_aix.c +++ b/ctdb/common/system_aix.c @@ -50,7 +50,7 @@ int ctdb_sys_open_sending_socket(void) int s, ret; uint32_t one = 1; - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(" failed to open raw socket (%s)\n", strerror(errno))); @@ -127,7 +127,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(" failed to open raw socket (%s)\n", strerror(errno))); diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c index e11bcb2..a80189c 100644 --- a/ctdb/common/system_common.c +++ b/ctdb/common/system_common.c @@ -90,7 +90,7 @@ char *ctdb_sys_find_ifname(ctdb_sock_addr *addr) struct ifconf ifc; char *ptr; - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n", strerror(errno))); diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c index e88e9e2..37e4bae 100644 --- a/ctdb/common/system_freebsd.c +++ b/ctdb/common/system_freebsd.c @@ -164,7 +164,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip4pkt.tcp.th_sum = tcp_checksum((uint16_t *)&ip4pkt.tcp, sizeof(ip4pkt.tcp), &ip4pkt.ip); /* open a raw socket to send this segment from */ - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n", strerror(errno))); @@ -214,7 +214,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip6pkt.tcp.th_win = htons(1234); ip6pkt.tcp.th_sum = tcp_checksum6((uint16_t *)&ip6pkt.tcp, sizeof(ip6pkt.tcp), &ip6pkt.ip6); - s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW); + s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT, (__location__ " Failed to open sending socket\n")); return -1; diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c index 1246205..e5b8e05 100644 --- a/ctdb/common/system_gnu.c +++ b/ctdb/common/system_gnu.c @@ -162,7 +162,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp, sizeof(ip4pkt.tcp), &ip4pkt.ip); /* open a raw socket to send this segment from */ - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n", strerror(errno))); @@ -209,7 +209,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip6pkt.tcp.window = htons(1234); ip6pkt.tcp.check = tcp_checksum6((uint16_t *)&ip6pkt.tcp, sizeof(ip6pkt.tcp), &ip6pkt.ip6); - s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW); + s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT, (__location__ " Failed to open sending socket\n")); return -1; diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c index b030317..4be678d 100644 --- a/ctdb/common/system_kfreebsd.c +++ b/ctdb/common/system_kfreebsd.c @@ -162,7 +162,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp, sizeof(ip4pkt.tcp), &ip4pkt.ip); /* open a raw socket to send this segment from */ - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n", strerror(errno))); @@ -209,7 +209,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip6pkt.tcp.window = htons(1234); ip6pkt.tcp.check = tcp_checksum6((uint16_t *)&ip6pkt.tcp, sizeof(ip6pkt.tcp), &ip6pkt.ip6); - s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW); + s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT, (__location__ " Failed to open sending socket\n")); return -1; diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c index 55c22c5..d523617 100644 --- a/ctdb/common/system_linux.c +++ b/ctdb/common/system_linux.c @@ -100,7 +100,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface) switch (addr->ip.sin_family) { case AF_INET: - s = socket(PF_PACKET, SOCK_RAW, htons(ETHERTYPE_ARP)); + s = socket(AF_PACKET, SOCK_RAW, ETHERTYPE_ARP); if (s == -1){ DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n")); return -1; @@ -194,7 +194,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface) close(s); break; case AF_INET6: - s = socket(PF_PACKET, SOCK_RAW, htons(ETHERTYPE_ARP)); + s = socket(AF_PACKET, SOCK_RAW, ETHERTYPE_ARP); if (s == -1){ DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n")); return -1; @@ -370,7 +370,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip4pkt.tcp.check = tcp_checksum((uint16_t *)&ip4pkt.tcp, sizeof(ip4pkt.tcp), &ip4pkt.ip); /* open a raw socket to send this segment from */ - s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW)); + s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n", strerror(errno))); @@ -419,7 +419,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest, ip6pkt.tcp.window = htons(1234); ip6pkt.tcp.check = tcp_checksum6((uint16_t *)&ip6pkt.tcp, sizeof(ip6pkt.tcp), &ip6pkt.ip6); - s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW); + s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW); if (s == -1) { DEBUG(DEBUG_CRIT, (__location__ " Failed to open sending socket\n")); return -1; @@ -460,7 +460,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data) int s; /* Open a socket to capture all traffic */ - s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + s = socket(AF_PACKET, SOCK_RAW, ETH_P_ALL); if (s == -1) { DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n")); return -1; @@ -581,7 +581,7 @@ bool ctdb_sys_check_iface_exists(const char *iface) int s; struct ifreq ifr; - s = socket(PF_PACKET, SOCK_RAW, 0); + s = socket(AF_PACKET, SOCK_RAW, 0); if (s == -1){ /* We don't know if the interface exists, so assume yes */ DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n")); diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 61ab896..9061642 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -4365,7 +4365,7 @@ static int control_chktcpport(struct ctdb_context *ctdb, int argc, const char ** port = atoi(argv[0]); - s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (s == -1) { printf("Failed to open local socket\n"); return errno; @@ -4377,7 +4377,7 @@ static int control_chktcpport(struct ctdb_context *ctdb, int argc, const char ** } bzero(&sin, sizeof(sin)); - sin.sin_family = PF_INET; + sin.sin_family = AF_INET; sin.sin_port = htons(port); ret = bind(s, (struct sockaddr *)&sin, sizeof(sin)); close(s); diff --git a/ctdb/utils/smnotify/smnotify.c b/ctdb/utils/smnotify/smnotify.c index fa584ff..0cd61c7 100644 --- a/ctdb/utils/smnotify/smnotify.c +++ b/ctdb/utils/smnotify/smnotify.c @@ -43,14 +43,14 @@ static int create_socket(const char *addr, int port) int s; struct sockaddr_in sock_in; - s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); if (s == -1) { printf("Failed to open local socket\n"); exit(10); } bzero(&sock_in, sizeof(sock_in)); - sock_in.sin_family = PF_INET; + sock_in.sin_family = AF_INET; sock_in.sin_port = htons(port); inet_aton(addr, &sock_in.sin_addr); if (bind(s, (struct sockaddr *)&sock_in, sizeof(sock_in)) == -1) { @@ -124,7 +124,7 @@ int main(int argc, const char *argv[]) /* Setup a sockaddr_in for the client we want to notify */ bzero(&sock_cl, sizeof(sock_cl)); - sock_cl.sin_family = PF_INET; + sock_cl.sin_family = AF_INET; sock_cl.sin_port = htons(clientport); inet_aton(client, &sock_cl.sin_addr); diff --git a/ctdb/wscript b/ctdb/wscript index e1fad17..c27f869 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -308,7 +308,7 @@ def build(bld): '''ibwrapper.c ibw_ctdb.c ibw_ctdb_init.c'''), includes='include', - deps='replace talloc tevent') + deps='replace talloc tevent tdb') ib_deps = ' ctdb-ib rdmacm ibverbs' if sys.platform.startswith('linux'): diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index 19daaf6..a5c6230 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -264,7 +264,7 @@ interface netlogon uint32 sidcount; [size_is(sidcount)] netr_SidAttr *sids; lsa_String dns_domainname; - lsa_String principle; + lsa_String principal_name; uint32 unknown4[20]; } netr_SamInfo6; diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index 9194cbd..e65fd58 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -173,10 +173,10 @@ NTSTATUS serverinfo_to_SamInfo6(struct auth_serversupplied_info *server_info, return NT_STATUS_NO_MEMORY; } - sam6->principle.string = talloc_asprintf(sam6, "%s@%s", - sam6->base.account_name.string, - sam6->dns_domainname.string); - if (sam6->principle.string == NULL) { + sam6->principal_name.string = talloc_asprintf( + sam6, "%s@%s", sam6->base.account_name.string, + sam6->dns_domainname.string); + if (sam6->principal_name.string == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index 6807726..d0a7f54 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -2250,6 +2250,7 @@ static NTSTATUS samdb_set_password_internal(struct ldb_context *ldb, TALLOC_CTX status = NT_STATUS_UNSUCCESSFUL; if (errmsg != NULL) { werr = W_ERROR(strtol(errmsg, &endptr, 16)); + DBG_WARNING("%s\n", errmsg); } if (endptr != errmsg) { if (W_ERROR_EQUAL(werr, WERR_INVALID_PASSWORD)) { diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c index 49b5b2f..34bf1ea 100644 --- a/source4/rpc_server/netlogon/dcerpc_netlogon.c +++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c @@ -991,9 +991,10 @@ static NTSTATUS dcesrv_netr_LogonSamLogon_base(struct dcesrv_call_state *dce_cal sam6->sids = sam3->sids; sam6->dns_domainname.string = lpcfg_dnsdomain(dce_call->conn->dce_ctx->lp_ctx); - sam6->principle.string = talloc_asprintf(mem_ctx, "%s@%s", - sam->account_name.string, sam6->dns_domainname.string); - NT_STATUS_HAVE_NO_MEMORY(sam6->principle.string); + sam6->principal_name.string = talloc_asprintf( + mem_ctx, "%s@%s", sam->account_name.string, + sam6->dns_domainname.string); + NT_STATUS_HAVE_NO_MEMORY(sam6->principal_name.string); /* And put into the talloc tree */ talloc_steal(sam6, sam3); -- Samba Shared Repository