Author: gd Date: 2006-05-13 01:29:04 +0000 (Sat, 13 May 2006) New Revision: 15559
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15559 Log: Smaller fixes for the new cldap code: * replace printf to stderr with DEBUG statements as they get printed in daemons * "net ads lookup" return code Guenther Modified: branches/SAMBA_3_0/source/libads/cldap.c branches/SAMBA_3_0/source/utils/net_ads.c trunk/source/libads/cldap.c trunk/source/utils/net_ads.c Changeset: Modified: branches/SAMBA_3_0/source/libads/cldap.c =================================================================== --- branches/SAMBA_3_0/source/libads/cldap.c 2006-05-12 23:20:39 UTC (rev 15558) +++ branches/SAMBA_3_0/source/libads/cldap.c 2006-05-13 01:29:04 UTC (rev 15559) @@ -66,7 +66,7 @@ uint8 len = (uint8)*(ptr++); if ((pret - ret + len + 1) >= MAX_DNS_LABEL) { - d_fprintf(stderr, "DC returning too long DNS name\n"); + DEBUG(1,("DC returning too long DNS name\n")); return 0; } @@ -151,13 +151,13 @@ asn1_pop_tag(&data); if (data.has_error) { - d_fprintf(stderr, "Failed to build cldap netlogon at offset %d\n", (int)data.ofs); + DEBUG(2,("Failed to build cldap netlogon at offset %d\n", (int)data.ofs)); asn1_free(&data); return -1; } if (write(sock, data.data, data.length) != (ssize_t)data.length) { - d_fprintf(stderr, "failed to send cldap query (%s)\n", strerror(errno)); + DEBUG(2,("failed to send cldap query (%s)\n", strerror(errno))); } asn1_free(&data); @@ -203,7 +203,7 @@ alarm(0); if (ret <= 0) { - d_fprintf(stderr, "no reply received to cldap netlogon\n"); + DEBUG(1,("no reply received to cldap netlogon\n")); return -1; } blob.length = ret; @@ -225,7 +225,7 @@ asn1_end_tag(&data); if (data.has_error) { - d_fprintf(stderr, "Failed to parse cldap reply\n"); + DEBUG(1,("Failed to parse cldap reply\n")); return -1; } Modified: branches/SAMBA_3_0/source/utils/net_ads.c =================================================================== --- branches/SAMBA_3_0/source/utils/net_ads.c 2006-05-12 23:20:39 UTC (rev 15558) +++ branches/SAMBA_3_0/source/utils/net_ads.c 2006-05-13 01:29:04 UTC (rev 15559) @@ -83,7 +83,6 @@ */ static int net_ads_cldap_netlogon(ADS_STRUCT *ads) { - int ret; struct cldap_netlogon_reply reply; if ( !ads_cldap_netlogon( inet_ntoa(ads->ldap_ip), ads->server.realm, &reply ) ) { @@ -147,7 +146,7 @@ d_printf("LMNT Token: %.2x\n", reply.lmnt_token); d_printf("LM20 Token: %.2x\n", reply.lm20_token); - return ret; + return 0; } Modified: trunk/source/libads/cldap.c =================================================================== --- trunk/source/libads/cldap.c 2006-05-12 23:20:39 UTC (rev 15558) +++ trunk/source/libads/cldap.c 2006-05-13 01:29:04 UTC (rev 15559) @@ -66,7 +66,7 @@ uint8 len = (uint8)*(ptr++); if ((pret - ret + len + 1) >= MAX_DNS_LABEL) { - d_fprintf(stderr, "DC returning too long DNS name\n"); + DEBUG(1,("DC returning too long DNS name\n")); return 0; } @@ -151,13 +151,13 @@ asn1_pop_tag(&data); if (data.has_error) { - d_fprintf(stderr, "Failed to build cldap netlogon at offset %d\n", (int)data.ofs); + DEBUG(2,("Failed to build cldap netlogon at offset %d\n", (int)data.ofs)); asn1_free(&data); return -1; } if (write(sock, data.data, data.length) != (ssize_t)data.length) { - d_fprintf(stderr, "failed to send cldap query (%s)\n", strerror(errno)); + DEBUG(2,("failed to send cldap query (%s)\n", strerror(errno))); } asn1_free(&data); @@ -203,7 +203,7 @@ alarm(0); if (ret <= 0) { - d_fprintf(stderr, "no reply received to cldap netlogon\n"); + DEBUG(1,("no reply received to cldap netlogon\n")); return -1; } blob.length = ret; @@ -225,7 +225,7 @@ asn1_end_tag(&data); if (data.has_error) { - d_fprintf(stderr, "Failed to parse cldap reply\n"); + DEBUG(1,("Failed to parse cldap reply\n")); return -1; } Modified: trunk/source/utils/net_ads.c =================================================================== --- trunk/source/utils/net_ads.c 2006-05-12 23:20:39 UTC (rev 15558) +++ trunk/source/utils/net_ads.c 2006-05-13 01:29:04 UTC (rev 15559) @@ -83,7 +83,6 @@ */ static int net_ads_cldap_netlogon(ADS_STRUCT *ads) { - int ret; struct cldap_netlogon_reply reply; if ( !ads_cldap_netlogon( inet_ntoa(ads->ldap_ip), ads->server.realm, &reply ) ) { @@ -147,7 +146,7 @@ d_printf("LMNT Token: %.2x\n", reply.lmnt_token); d_printf("LM20 Token: %.2x\n", reply.lm20_token); - return ret; + return 0; }
