From owner-svn-src-all@freebsd.org Fri Dec 2 06:08:27 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 669F5C5EB9C; Fri, 2 Dec 2016 06:08:27 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: from mail-yw0-x22b.google.com (mail-yw0-x22b.google.com [IPv6:2607:f8b0:4002:c05::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 245FD12CD; Fri, 2 Dec 2016 06:08:27 +0000 (UTC) (envelope-from araujobsdport@gmail.com) Received: by mail-yw0-x22b.google.com with SMTP id t125so212315312ywc.1; Thu, 01 Dec 2016 22:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:in-reply-to:references:from:date:message-id :subject:to:cc; bh=CHhVi54oOOD0mip0SmfQF1KpVBdHHPseClaZ78YP6Kk=; b=f09ObRzYFX/fq9c9FbINIu4t4zJXq4Su/zgoUO5K638CyIxDPT0KCxoLsbFs3RFDrm ChQwCkuJX/fk9TxImqWoKxyeiONtv1wMCwjjMyB74wXQw3ajPjIJFD8hmkMBK8j+lgkk N5wPvEyZFylCLjwym/J60fbHTnPmMEXZx0f4cTdQPwBPmHogJ3ZKjMcSV2rleUM928Nd xsPniTYgxpyI13Wn4GMYBUxXLVuV8/6Kf+3SG5a8BczVgdBiAsBA53WJZ+t6J/lSJHHG 6UkaCWUGGEhw+wzP9/O/vp9xX+b6xv5+YPmFlmX2gbEfupw03dh8Wy76E4bapOhdUOxg 1khQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:reply-to:in-reply-to:references :from:date:message-id:subject:to:cc; bh=CHhVi54oOOD0mip0SmfQF1KpVBdHHPseClaZ78YP6Kk=; b=dRZbELhwm07Z4otU41IQGwGpUQpcyYL3lT6xZI5q4YFdOAy+nBwFfKwEnjwnZfmb4T I79r43AAlnZzjD9bwMebmSgoSlWz9e78vH5iAZd8rCG7mUA5+8zToTS7HXypdADcRVnk EWlA54AcNuDjpKNN1T2j8/tRI4AkknReS0nRVukpk3a9dBQxg/WzV0r/IZl35hz/EpPy b7TlSo8e2mpioe0q28AELiBeKDWaoZccLdZat7l9D/4YFhYyi5k4EouRm5HUrQwc5LHm 240eAzGalTKCOIRVcVg2OGz5OwcC7kR2jbiGSRh+t0QfZLkbQG9MnFfoJUWJaxaYTnUb t2FQ== X-Gm-Message-State: AKaTC00QeUbfUmJ3pKGwb4Ptq6foykQ4UviUrs5xAuErfwQazbA2QGKdTn+ZW7MioPimik5AzDGQRHjmYCyqCA== X-Received: by 10.13.237.67 with SMTP id w64mr47889444ywe.167.1480658906117; Thu, 01 Dec 2016 22:08:26 -0800 (PST) MIME-Version: 1.0 Received: by 10.13.195.3 with HTTP; Thu, 1 Dec 2016 22:08:25 -0800 (PST) Reply-To: araujo@freebsd.org In-Reply-To: <201612020607.uB267SI7045630@repo.freebsd.org> References: <201612020607.uB267SI7045630@repo.freebsd.org> From: Marcelo Araujo Date: Fri, 2 Dec 2016 14:08:25 +0800 Message-ID: Subject: Re: svn commit: r309393 - head/usr.sbin/ypldap To: Marcelo Araujo Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2016 06:08:27 -0000 Forgot MFC after two weeks in my last two commits, so noted in my todo list. Br, 2016-12-02 14:07 GMT+08:00 Marcelo Araujo : > Author: araujo > Date: Fri Dec 2 06:07:27 2016 > New Revision: 309393 > URL: https://svnweb.freebsd.org/changeset/base/309393 > > Log: > Use memset(3) instead of bzero(3). > > Obtained from: OpenBSD (r1.12, r1.20, r1.18 and r1.37) > > Modified: > head/usr.sbin/ypldap/ldapclient.c > head/usr.sbin/ypldap/yp.c > head/usr.sbin/ypldap/ypldap.c > head/usr.sbin/ypldap/ypldap_dns.c > > Modified: head/usr.sbin/ypldap/ldapclient.c > ============================================================ > ================== > --- head/usr.sbin/ypldap/ldapclient.c Fri Dec 2 05:49:22 2016 > (r309392) > +++ head/usr.sbin/ypldap/ldapclient.c Fri Dec 2 06:07:27 2016 > (r309393) > @@ -363,7 +363,7 @@ ldapclient(int pipe_main2client[2]) > return (pid); > } > > - bzero(&env, sizeof(env)); > + memset(&env, 0, sizeof(env)); > TAILQ_INIT(&env.sc_idms); > > if ((pw = getpwnam(YPLDAP_USER)) == NULL) > @@ -437,7 +437,7 @@ client_build_req(struct idm *idm, struct > char **ldap_attrs; > int i, k; > > - bzero(ir, sizeof(*ir)); > + memset(ir, 0, sizeof(*ir)); > for (i = min_attr; i < max_attr; i++) { > if (idm->idm_flags & F_FIXED_ATTR(i)) { > if (strlcat(ir->ir_line, idm->idm_attrs[i], > @@ -594,7 +594,7 @@ client_try_idm(struct env *env, struct i > aldap_freemsg(m); > } > > - bzero(attrs, sizeof(attrs)); > + memset(attrs, 0, sizeof(attrs)); > for (i = 0, j = 0; i < ATTR_MAX; i++) { > if (idm->idm_flags & F_FIXED_ATTR(i)) > continue; > @@ -611,7 +611,7 @@ client_try_idm(struct env *env, struct i > idm->idm_filters[FILTER_USER], 0, ATTR_MAX, IMSG_PW_ENTRY) == > -1) > goto bad; > > - bzero(attrs, sizeof(attrs)); > + memset(attrs, 0, sizeof(attrs)); > for (i = ATTR_GR_MIN, j = 0; i < ATTR_GR_MAX; i++) { > if (idm->idm_flags & F_FIXED_ATTR(i)) > continue; > > Modified: head/usr.sbin/ypldap/yp.c > ============================================================ > ================== > --- head/usr.sbin/ypldap/yp.c Fri Dec 2 05:49:22 2016 (r309392) > +++ head/usr.sbin/ypldap/yp.c Fri Dec 2 06:07:27 2016 (r309393) > @@ -342,7 +342,7 @@ ypproc_match_2_svc(ypreq_key *arg, struc > log_debug("argument too long"); > return (NULL); > } > - bzero(key, sizeof(key)); > + memset(key, 0, sizeof(key)); > (void)strncpy(key, arg->key.keydat_val, arg->key.keydat_len); > > if (strcmp(arg->map, "passwd.byname") == 0 || > @@ -486,7 +486,7 @@ ypproc_next_2_svc(ypreq_key *arg, struct > > if (strcmp(arg->map, "passwd.byname") == 0 || > strcmp(arg->map, "master.passwd.byname") == 0) { > - bzero(key, sizeof(key)); > + memset(key, 0, sizeof(key)); > (void)strncpy(key, arg->key.keydat_val, > arg->key.keydat_len); > ukey.ue_line = key; > @@ -517,7 +517,7 @@ ypproc_next_2_svc(ypreq_key *arg, struct > > > } else if (strcmp(arg->map, "group.byname") == 0) { > - bzero(key, sizeof(key)); > + memset(key, 0, sizeof(key)); > (void)strncpy(key, arg->key.keydat_val, > arg->key.keydat_len); > > @@ -567,7 +567,7 @@ ypproc_master_2_svc(ypreq_nokey *arg, st > static struct ypresp_master res; > static char master[YPMAXPEER + 1]; > > - bzero(&res, sizeof(res)); > + memset(&res, 0, sizeof(res)); > if (yp_valid_domain(arg->domain, (struct ypresp_val *)&res) == -1) > return (&res); > > @@ -620,7 +620,7 @@ yp_make_val(struct ypresp_val *res, char > { > static char buf[LINE_WIDTH]; > > - bzero(buf, sizeof(buf)); > + memset(buf, 0, sizeof(buf)); > > if (replacecolon) > line[strlen(line)] = ':'; > @@ -640,8 +640,8 @@ yp_make_keyval(struct ypresp_key_val *re > static char keybuf[YPMAXRECORD+1]; > static char buf[LINE_WIDTH]; > > - bzero(keybuf, sizeof(keybuf)); > - bzero(buf, sizeof(buf)); > + memset(keybuf, 0, sizeof(keybuf)); > + memset(buf, 0, sizeof(buf)); > > (void)strlcpy(keybuf, key, sizeof(keybuf)); > res->key.keydat_len = strlen(keybuf); > > Modified: head/usr.sbin/ypldap/ypldap.c > ============================================================ > ================== > --- head/usr.sbin/ypldap/ypldap.c Fri Dec 2 05:49:22 2016 > (r309392) > +++ head/usr.sbin/ypldap/ypldap.c Fri Dec 2 06:07:27 2016 > (r309393) > @@ -609,7 +609,7 @@ main(int argc, char *argv[]) > #warning disabling privilege revocation in debug mode > #endif > > - bzero(&tv, sizeof(tv)); > + memset(&tv, 0, sizeof(tv)); > evtimer_set(&ev_timer, main_init_timer, &env); > evtimer_add(&ev_timer, &tv); > > > Modified: head/usr.sbin/ypldap/ypldap_dns.c > ============================================================ > ================== > --- head/usr.sbin/ypldap/ypldap_dns.c Fri Dec 2 05:49:22 2016 > (r309392) > +++ head/usr.sbin/ypldap/ypldap_dns.c Fri Dec 2 06:07:27 2016 > (r309393) > @@ -212,7 +212,7 @@ host_dns(const char *s, struct ypldap_ad > struct sockaddr_in6 *sa_in6; > struct ypldap_addr *h; > > - bzero(&hints, sizeof(hints)); > + memset(&hints, 0, sizeof(hints)); > hints.ai_family = PF_UNSPEC; > hints.ai_socktype = SOCK_DGRAM; /* DUMMY */ > error = getaddrinfo(s, NULL, &hints, &res0); > > -- -- Marcelo Araujo (__)araujo@FreeBSD.org \\\'',)http://www.FreeBSD.org \/ \ ^ Power To Server. .\. /_)