Re: svn commit: r367459 - head/usr.sbin/syslogd

2020-11-09 Thread Cy Schubert 
NP. That's happened to me a couple of times at $JOB.


-- 
Cheers,
Cy Schubert 
FreeBSD UNIX: Web:  https://FreeBSD.org
NTP:   Web:  https://nwtime.org

The need of the many outweighs the greed of the few.


In message <4b605497-6dd1-72fe-fb05-b45c61ee6...@freebsd.org>, Bryan 
Drewery wr
ites:
>
> Thanks. I had the commit in a branch that had a debug commit after. The
> brace was rebased wrong.
>
> On 11/7/2020 11:17 AM, Cy Schubert wrote:
> > Author: cy
> > Date: Sat Nov  7 19:17:37 2020
> > New Revision: 367459
> > URL: https://svnweb.freebsd.org/changeset/base/367459
> >=20
> > Log:
> >   Fix build post-r367455.
> >  =20
> >   MFC after:2 weeks
> >   X-MFC with:   r367455
> >=20
> > Modified:
> >   head/usr.sbin/syslogd/syslogd.c
> >=20
> > Modified: head/usr.sbin/syslogd/syslogd.c
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
> =3D=3D=3D=3D
> > --- head/usr.sbin/syslogd/syslogd.c Sat Nov  7 18:15:29 2020(r36745
> 8)
> > +++ head/usr.sbin/syslogd/syslogd.c Sat Nov  7 19:17:37 2020(r36745
> 9)
> > @@ -1873,7 +1873,7 @@ fprintlog_write(struct filed *f, struct iovlist *=
> il, i
> > continue;
> > if (sl->sl_sa =3D=3D NULL ||
> > sl->sl_family =3D=3D AF_UNSPEC ||
> > -   sl->sl_family =3D=3D AF_LOCAL) {
> > +   sl->sl_family =3D=3D AF_LOCAL)
> > continue;
> > lsent =3D sendmsg(sl->sl_socket, , 0);
> > if (lsent =3D=3D (ssize_t)il->totalsize)
> >=20
>
>
> --=20
> Regards,
> Bryan Drewery
>
> --9CBC57D81FB1CF44779F663A
> Content-Type: application/pgp-keys;
>  name="OpenPGP_0x35D771BB6E4697CF_and_old_rev.asc"
> Content-Transfer-Encoding: base64
> Content-Disposition: attachment;
>  filename="OpenPGP_0x35D771BB6E4697CF_and_old_rev.asc"
>
> LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tDQoNCnhzQk5CRkpwaG1zQkNB
> RGlGZ21TNGJJendaaWpyUzMxU2pFTXpnK241ek5lbGxnTStIa1Nod2VocHFDaXloWGRXcnZI
> NmRUWmE2dTUNCjBwYlVJWDdkb1RSN1c3UFFIQ2pDVHF0cHd2Y2owZXVsWnZhK2lIRnArWHJi
> Z1NGSG4rVlZYZ2tZUDJNRnlTeVpSRmFiRDJxcXpKQkUNCkpvZmhwdjRIdlk2dVFJNUs5OXBN
> cUtyMVovbEhxc2lqWVl1NFJIMk9md0I1UGluSWQ3eGVsZHpXRW9uVm9DcityZnh6Ty9VcmdB
> NnYNCi8zbGF5R1pjS05IRmptYzNOcW9OMURYdGRhRUhxdGpJb3p6Ym5kVmtINmxrRnZJcEly
> STZpNW94OHB3cFZ4c3hMQ3IvNE11c2Q1Q1cNCmdIaWV0NWtTdzJTek5lQThGYnhkTFlDcFhO
> VnUrdUJBQ0ViQ1VQK0NTTnkzTlZmRVV4c0JBQkVCQUFITkpFSnllV0Z1SUVSeVpYZGwNCmNu
> a2dQR0prY21WM1pYSjVRRVp5WldWQ1UwUXViM0puUHNMQlhBUVFBUW9BQmdVQ1VtbUpsUUFL
> Q1JCdWVDckFQSnNNK1RmZEQvOTMNCmlqVUlCOW94bU5EcEZqMERtQ0IyWlRZZTN0T0Y0WE9x
> THJMTW9UaVpKbmNhU0xqRUhxcW8vaTYySFRtV2pSZjJoL0pwdGE4WmwzRCsNCmRpdlNkSjIr
> RFdBb29aOU5hanQzRnhlckhVbXVFWldUR3lJSC9tQnZubUI2R2pCb0NDdE56SVQwL3FGeklT
> R3RURFJQcHNwbHo5QXENCjczZHozczFadjUyWUt2a3d2MVp3d2svNGVmVGlqRTk0V3JOSXRv
> QkRXaCtXbmU3WkpMMVVVK0tOTktJWUNCQ3Z4Mjk3bGsvby9ZbkcNCmxNdHpIL0ZxVVIzVHU0
> UWo4MTE2aWVpVno2eVJ3eWI0OGJWYUtjYzEya2F5SjhOOFVEamZZYjZ3Wjlvc3RQcjVaSEJ4
> N0tIY1hUTEENCm5vTGhObDdPdVVKNGROU2luY2lZYTB3d0xDRTJ2ZkhIcjNDN05BOEpUM2ZL
> VElUVDZSekQ0VmtZN3BzUWN2blpBTC9ocGZsVXVldUUNCitnaWdZTmdSb00xZStrMENZRHow
> QkZmY1BkKytNQTdEbnNjNUVXOUJnc210bUVuY0o4Z3htV2xtM3VrMEJZRjZ0clpheTR3eXJa
> dkoNCm9vamNMVmkrYXAvbTUrYzRPbFZ0Uk9lVU9IUXVLdXQyZVk5bXkvU0lWcmZnUExBQ0hm
> eTd4d3E5ZXgyNFpaQU1IUUdyeHJTYWVZMmwNClhGV0gzWmtVc3NES1pJd0V1dVkzc09lSlY2
> TnRDWklhV2JtVjhQRS9wbGw0eERBSmVFT0lUUGlIbU9wRUJBVDdVQndWMTZqZTNhUEYNCjhF
> RDRhakc0RjAycXJpSC9YZWJncnR4eWZCSDFJMllFSlVNd1A4Z1R2VGxUOTJSd25PTTBmTEJj
> aHI3OXAvR1pXRnp3QXRRaXhNSk0NCkJCTVJBZ0FNQlFKU2E5MmNCWU1IaGgrQUFBb0pFR0hZ
> ZHNGRUNqUFN6aDhBblJkUXpFYlhFQVZ6dDJyV21GT1RVQUhGTHBvVUFKNDYNCkthNEYxcjBz
> WC8zeWpJSmJVSDYxRlkxbWJjTEFYQVFRQVFJQUJnVUNVbXZwY0FBS0NSRDF6Mkt6SUhzYm9Y
> MkVCLzR3NWxSUnM4ODINCjF3OXFHRkY5azJ2dWhxNEFKOWdNTHBJMEM5VFVOSk5RaU9sVEdh
> Tmp2MVNXSEQ1bVlqZ3IxRHBiTVdSY05HbXlDbnNYZjZCdDF5NDENCm1VUUV5NUZ6YUxVYTVR
> enFIdlIzWkd5NkNybFJDVmVqT01TMlZOQWxVOHI1YVh6MEVxTEhQNTVnb1FGYVE4aVEvY0Yv
> R1laeFlOaW4NCk9vYmh5K3V5ZTJiWE16azI2MFhlSkZ0S1Z6RUFlNmpoNlE1KythMWRnNm1q
> M0JROENEN3dhdERhY1k1WTZsb290UFRJQUN3cUdHb2YNCktCbHZNYW1MMVpWSXpKK0huamhs
> S3NtVzRBV2hMRFQxUDFudzNzOUJ0TEIxNUtzc0Q0TE54TGF0ZGpsaWRodWxkYm9xUkRwdExu
> NzMNCmlOM3dqVDdNQnJROGVGb0t5dlpNbFJONVBWNDl3c0JnQkJBQkNnQUtCUUpTYStkdUF3
> VUJlQUFLQ1JCU1R3dzNvTGxHb3dxNEIvb0MNCnFPeWRPL1E4bFRZY0M4K2t3b0VtMzBQekZ3
> Zk5BTzhvcHlHZjZuMGpwUzEwOW9vYkhSai9FOGlGSEd0VHROOFMyc0crMFp3Rk1lSUkNCnpY
> QzJqdE5qRDIwSHRpd0k4TWh5YUdHck9kTVBFM042VTIrNzBodzRSdmZnS1pCTnJ5TXlKSkJx
> UUptVXNkVEo4M09MZ1pGNldpdVYNCjVQYk1hSHd6U2NUL21zUyt5bmtVQjV6RzJmSVZ2SU5G
> aU9oTm9wbGZSNlJJSjhMM1ZUUDF1RWNIb0V6Z1dtTDVWbTNkaHkxcWh4YlkNCnlVckxrTngr
>

Re: svn commit: r367459 - head/usr.sbin/syslogd

2020-11-09 Thread Bryan Drewery 
Thanks. I had the commit in a branch that had a debug commit after. The
brace was rebased wrong.

On 11/7/2020 11:17 AM, Cy Schubert wrote:
> Author: cy
> Date: Sat Nov  7 19:17:37 2020
> New Revision: 367459
> URL: https://svnweb.freebsd.org/changeset/base/367459
> 
> Log:
>   Fix build post-r367455.
>   
>   MFC after:  2 weeks
>   X-MFC with: r367455
> 
> Modified:
>   head/usr.sbin/syslogd/syslogd.c
> 
> Modified: head/usr.sbin/syslogd/syslogd.c
> ==
> --- head/usr.sbin/syslogd/syslogd.c   Sat Nov  7 18:15:29 2020
> (r367458)
> +++ head/usr.sbin/syslogd/syslogd.c   Sat Nov  7 19:17:37 2020
> (r367459)
> @@ -1873,7 +1873,7 @@ fprintlog_write(struct filed *f, struct iovlist *il, i
>   continue;
>   if (sl->sl_sa == NULL ||
>   sl->sl_family == AF_UNSPEC ||
> - sl->sl_family == AF_LOCAL) {
> + sl->sl_family == AF_LOCAL)
>   continue;
>   lsent = sendmsg(sl->sl_socket, , 0);
>   if (lsent == (ssize_t)il->totalsize)
> 


-- 
Regards,
Bryan Drewery


OpenPGP_signature
Description: OpenPGP digital signature

svn commit: r367459 - head/usr.sbin/syslogd

2020-11-07 Thread Cy Schubert 
Author: cy
Date: Sat Nov  7 19:17:37 2020
New Revision: 367459
URL: https://svnweb.freebsd.org/changeset/base/367459

Log:
  Fix build post-r367455.
  
  MFC after:2 weeks
  X-MFC with:   r367455

Modified:
  head/usr.sbin/syslogd/syslogd.c

Modified: head/usr.sbin/syslogd/syslogd.c
==
--- head/usr.sbin/syslogd/syslogd.c Sat Nov  7 18:15:29 2020
(r367458)
+++ head/usr.sbin/syslogd/syslogd.c Sat Nov  7 19:17:37 2020
(r367459)
@@ -1873,7 +1873,7 @@ fprintlog_write(struct filed *f, struct iovlist *il, i
continue;
if (sl->sl_sa == NULL ||
sl->sl_family == AF_UNSPEC ||
-   sl->sl_family == AF_LOCAL) {
+   sl->sl_family == AF_LOCAL)
continue;
lsent = sendmsg(sl->sl_socket, , 0);
if (lsent == (ssize_t)il->totalsize)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"