Mail Archives: cygwin/2002/03/06/12:27:10
------_=_NextPart_000_01C1C532.68DB6550
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
> -----Original Message-----
> From: Corinna Vinschen [mailto:cygwin AT cygwin DOT com]
> Sent: Wednesday, March 06, 2002 6:03 PM
> To: cygwin AT cygwin DOT com
> Subject: Re: Suggestion for setup
>=20
>=20
> On Wed, Mar 06, 2002 at 11:43:47AM -0500, Chris Faylor wrote:
> > On Wed, Mar 06, 2002 at 04:32:24PM +0100, Corinna Vinschen wrote:
> > >On Wed, Mar 06, 2002 at 03:01:05PM +0100, Bernard Dautrevaux =
wrote:
> > >> As this is quite a simple patch, I proceed and here it=20
> is, for mkgroup.c and
> > >> mkpasswd.c:
> > >
> > >I have two problems with this patch:
> > >
> > >- No ChangeLog entry.
> > >- Do we have a signed copyright assignment from you?
> >=20
> > The patch also seemed to have some strange characters in=20
> it, at least on my
> > system.
>=20
> Right, I'm seeing these pipe characters:
>=20
> ***************
> *** 379,382 ****
> --- 381,386 ----
> | switch (i)
> | {
> + | case 'a':
> + | print_domain =3D -1;
> | case 'l':
> | print_local =3D 1;
>=20
> You too?
>=20
Don't know from where these can come; in my copy here I got:
***************
*** 379,382 ****
--- 381,386 ----
=A0 switch (i)
=A0 {
+ =A0 case 'a':
+ =A0 print_domain =3D -1;
=A0 case 'l':
=A0 print_local =3D 1;
I attach the original file below; the Changelog entry could be:
2002-03-06 Bernard Dautrevaux <dautrevaux AT microprocess DOT com>
* mkgroup.c: Add a '-a' option to generate both local and
domain groups, but without complaining if we cannot found
a domain controller (i.e. if we're in a workgroup instead
of a domain).
* mkpasswd.c: ditto, but for users
As for a copyright assignment, I thought the change was sufficiently =
small
to not need one; the "contributing" page says we need one if the =
"change is
going to be a significant one in terms of the size of your code =
changes". I
hope changing about 10 lines in two files is not considered a =
"significant"
change but rather a minor one. I would *really* prefer not having to go
through all the paperwork (something I may even have to decline due to =
our
overall workload).
Bernard
--------------------------------------------
Bernard Dautrevaux
Microprocess Ingenierie
97 bis, rue de Colombes
92400 COURBEVOIE
FRANCE
Tel: +33 (0) 1 47 68 80 80
Fax: +33 (0) 1 47 88 97 85
e-mail: dautrevaux AT microprocess DOT com
b DOT dautrevaux AT usa DOT net
--------------------------------------------=20
------_=_NextPart_000_01C1C532.68DB6550
Content-Type: application/octet-stream;
name="patch.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="patch.diff"
*** winsup/utils/mkgroup.c 2001/04/26 19:02:52 1.3=0A=
--- winsup/utils/mkgroup.c 2002/03/06 14:10:18=0A=
***************=0A=
*** 367,370 ****=0A=
--- 367,373 ----=0A=
fprintf (stderr, " specified (or from the =
current domain if there is\n");=0A=
fprintf (stderr, " no domain =
specified)\n");=0A=
+ fprintf (stderr, " -a,--all print both local and =
global group information from the\n");=0A=
+ fprintf (stderr, " specified domain (or =
from the current domain if there is\n");=0A=
+ fprintf (stderr, " no domain specified) =
but do not complain if not in a domain\n");=0A=
fprintf (stderr, " -o,--id-offset offset change the default =
offset (10000) added to uids\n");=0A=
fprintf (stderr, " in domain =
accounts.\n");=0A=
***************=0A=
*** 416,419 ****=0A=
--- 419,424 ----=0A=
switch (i)=0A=
{=0A=
+ case 'a':=0A=
+ print_domain =3D -1;=0A=
case 'l':=0A=
print_local =3D 1;=0A=
***************=0A=
*** 439,443 ****=0A=
if (!print_local && !print_domain)=0A=
{=0A=
! fprintf (stderr, "%s: Specify one of `-l' or `-d'\n", =
argv[0]);=0A=
return 1;=0A=
}=0A=
--- 444,448 ----=0A=
if (!print_local && !print_domain)=0A=
{=0A=
! fprintf (stderr, "%s: Specify one of `-l', `-d' or `-a'\n", =
argv[0]);=0A=
return 1;=0A=
}=0A=
***************=0A=
*** 447,451 ****=0A=
{=0A=
fprintf (stderr, "%s: A domain name is only accepted "=0A=
! "when `-d' is given.\n", argv[0]);=0A=
return 1;=0A=
}=0A=
--- 452,456 ----=0A=
{=0A=
fprintf (stderr, "%s: A domain name is only accepted "=0A=
! "when `-d' or `-a' is given.\n", argv[0]);=0A=
return 1;=0A=
}=0A=
***************=0A=
*** 545,553 ****=0A=
if (rc !=3D ERROR_SUCCESS)=0A=
{=0A=
! fprintf (stderr, "Cannot get PDC, code =3D %ld\n", rc);=0A=
! exit (1);=0A=
}=0A=
! =0A=
! enum_groups (servername, print_sids, print_users, =
id_offset);=0A=
}=0A=
=0A=
--- 550,561 ----=0A=
if (rc !=3D ERROR_SUCCESS)=0A=
{=0A=
! if (print_domain > 0) =0A=
! {=0A=
! fprintf (stderr, "Cannot get DC, code =3D %ld\n", rc);=0A=
! exit (1);=0A=
! }=0A=
}=0A=
! else=0A=
! enum_groups (servername, print_sids, print_users, id_offset);=0A=
}=0A=
=0A=
*** winsup/utils/mkpasswd.c 2001/04/26 19:02:52 1.4=0A=
--- winsup/utils/mkpasswd.c 2002/03/06 14:10:19=0A=
***************=0A=
*** 321,324 ****=0A=
--- 321,326 ----=0A=
fprintf (stderr, " -d,--domain print domain accounts =
(from current domain\n");=0A=
fprintf (stderr, " if no domain =
specified)\n");=0A=
+ fprintf (stderr, " -a,--all print local and domain =
accounts (from current domain\n");=0A=
+ fprintf (stderr, " if no domain =
specified) without complaining if not in domain\n");=0A=
fprintf (stderr, " -o,--id-offset offset change the default =
offset (10000) added to uids\n");=0A=
fprintf (stderr, " in domain =
accounts.\n");=0A=
***************=0A=
*** 379,382 ****=0A=
--- 381,386 ----=0A=
switch (i)=0A=
{=0A=
+ case 'a':=0A=
+ print_domain =3D -1;=0A=
case 'l':=0A=
print_local =3D 1;=0A=
***************=0A=
*** 416,420 ****=0A=
if (!print_local && !print_domain && !print_local_groups)=0A=
{=0A=
! fprintf (stderr, "%s: Specify one of `-l', `-d' or `-g'\n", =
argv[0]);=0A=
return 1;=0A=
}=0A=
--- 420,424 ----=0A=
if (!print_local && !print_domain && !print_local_groups)=0A=
{=0A=
! fprintf (stderr, "%s: Specify one of `-l', `-d', `-a' or =
`-g'\n", argv[0]);=0A=
return 1;=0A=
}=0A=
***************=0A=
*** 424,428 ****=0A=
{=0A=
fprintf (stderr, "%s: A domain name is only accepted "=0A=
! "when `-d' is given.\n", argv[0]);=0A=
return 1;=0A=
}=0A=
--- 428,432 ----=0A=
{=0A=
fprintf (stderr, "%s: A domain name is only accepted "=0A=
! "when `-d' or `-a' is given.\n", argv[0]);=0A=
return 1;=0A=
}=0A=
***************=0A=
*** 528,536 ****=0A=
if (rc !=3D ERROR_SUCCESS)=0A=
{=0A=
! fprintf (stderr, "Cannot get DC, code =3D %ld\n", rc);=0A=
! exit (1);=0A=
}=0A=
! =0A=
! enum_users (servername, print_sids, print_cygpath, passed_home_p=
ath, id_offset);=0A=
}=0A=
=0A=
--- 532,543 ----=0A=
if (rc !=3D ERROR_SUCCESS)=0A=
{=0A=
! if (print_domain > 0) =0A=
! {=0A=
! fprintf (stderr, "Cannot get DC, code =3D %ld\n", rc);=0A=
! exit (1);=0A=
! }=0A=
}=0A=
! else=0A=
! enum_users (servername, print_sids, print_cygpath, passed_home_path, =
id_offset);=0A=
}=0A=
=0A=
------_=_NextPart_000_01C1C532.68DB6550
Content-Type: text/plain; charset=us-ascii
--
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
Bug reporting: http://cygwin.com/bugs.html
Documentation: http://cygwin.com/docs.html
FAQ: http://cygwin.com/faq/
------_=_NextPart_000_01C1C532.68DB6550--
- Raw text -