Author: vlendec Date: 2005-08-01 18:13:45 +0000 (Mon, 01 Aug 2005) New Revision: 8888
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8888 Log: Merge some stuff from 3_0 Modified: trunk/source/libads/ldap.c Changeset: Modified: trunk/source/libads/ldap.c =================================================================== --- trunk/source/libads/ldap.c 2005-08-01 17:33:43 UTC (rev 8887) +++ trunk/source/libads/ldap.c 2005-08-01 18:13:45 UTC (rev 8888) @@ -481,15 +481,15 @@ ber_printf(cookie_be, "{io}", (ber_int_t) 1000, "", 0); } ber_flatten(cookie_be, &cookie_bv); - PagedResults.ldctl_oid = ADS_PAGE_CTL_OID; + PagedResults.ldctl_oid = CONST_DISCARD(char *, ADS_PAGE_CTL_OID); PagedResults.ldctl_iscritical = (char) 1; PagedResults.ldctl_value.bv_len = cookie_bv->bv_len; PagedResults.ldctl_value.bv_val = cookie_bv->bv_val; - NoReferrals.ldctl_oid = ADS_NO_REFERRALS_OID; + NoReferrals.ldctl_oid = CONST_DISCARD(char *, ADS_NO_REFERRALS_OID); NoReferrals.ldctl_iscritical = (char) 0; NoReferrals.ldctl_value.bv_len = 0; - NoReferrals.ldctl_value.bv_val = ""; + NoReferrals.ldctl_value.bv_val = CONST_DISCARD(char *, ""); controls[0] = &NoReferrals; @@ -962,7 +962,7 @@ non-existent attribute (but allowable for the object) to run */ LDAPControl PermitModify = { - ADS_PERMIT_MODIFY_OID, + CONST_DISCARD(char *, ADS_PERMIT_MODIFY_OID), {0, NULL}, (char) 1}; LDAPControl *controls[2]; @@ -2372,7 +2372,19 @@ 2002, timezone 0 */ static time_t ads_parse_time(const char *str) { - return generalized_to_unix_time(str); + struct tm tm; + + ZERO_STRUCT(tm); + + if (sscanf(str, "%4d%2d%2d%2d%2d%2d", + &tm.tm_year, &tm.tm_mon, &tm.tm_mday, + &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) { + return 0; + } + tm.tm_year -= 1900; + tm.tm_mon -= 1; + + return timegm(&tm); } @@ -2603,7 +2615,7 @@ int i; void *res; const char *attrs[] = {"servicePrincipalName", NULL}; - int num_principals; + size_t num_principals; (*workgroup) = NULL;
