commit 26bf5a1029434c98db85947eed11ce3090b2f5db

Author: Florian Weimer <fweimer@redhat.com>

Date:   Mon Jun 19 13:17:03 2017 +0200

    resolv: Move res_randomid to its own file

diff --git a/resolv/Makefile b/resolv/Makefile

index 0ebb2af795c6fb7b..c2a8a3a631f6bb2e 100644

--- a/resolv/Makefile

+++ b/resolv/Makefile

@@ -28,7 +28,7 @@ headers	:= resolv.h \

 	   sys/bitypes.h

 routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \

-	    res_hconf res_libc res-state

+	    res_hconf res_libc res-state res_randomid

 tests = tst-aton tst-leaks tst-inet_ntop

 xtests = tst-leaks2

diff --git a/resolv/res_init.c b/resolv/res_init.c

index 57223b470af9ba4d..ef2e7c0db465dba6 100644

--- a/resolv/res_init.c

+++ b/resolv/res_init.c

@@ -479,13 +479,6 @@ net_mask (struct in_addr in)

 	return (htonl(IN_CLASSC_NET));

 }

-u_int

-res_randomid(void) {

-	return 0xffff & __getpid();

-}

-libc_hidden_def (__res_randomid)

-

-

 /*

  * This routine is for closing the socket if a virtual circuit is used and

  * the program wants to close it.  This provides support for endhostent()

diff --git a/resolv/res_randomid.c b/resolv/res_randomid.c

new file mode 100644

index 0000000000000000..e0dbe4c8ff259527

--- /dev/null

+++ b/resolv/res_randomid.c

@@ -0,0 +1,92 @@

+/* Legacy libresolv random number generator.

+   Copyright (C) 1995-2017 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Lesser General Public

+   License as published by the Free Software Foundation; either

+   version 2.1 of the License, or (at your option) any later version.

+

+   The GNU C Library is distributed in the hope that it will be useful,

+   but WITHOUT ANY WARRANTY; without even the implied warranty of

+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+   Lesser General Public License for more details.

+

+   You should have received a copy of the GNU Lesser General Public

+   License along with the GNU C Library; if not, see

+   <http://www.gnu.org/licenses/>.  */

+

+/*

+ * Copyright (c) 1985, 1989, 1993

+ *    The Regents of the University of California.  All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer.

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the

+ *    documentation and/or other materials provided with the distribution.

+ * 4. Neither the name of the University nor the names of its contributors

+ *    may be used to endorse or promote products derived from this software

+ *    without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

+ * SUCH DAMAGE.

+ */

+

+/*

+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.

+ *

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies, and that

+ * the name of Digital Equipment Corporation not be used in advertising or

+ * publicity pertaining to distribution of the document or software without

+ * specific, written prior permission.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL

+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES

+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT

+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL

+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR

+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS

+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+ * SOFTWARE.

+ */

+

+/*

+ * Portions Copyright (c) 1996-1999 by Internet Software Consortium.

+ *

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS

+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES

+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE

+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL

+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR

+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS

+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

+ * SOFTWARE.

+ */

+

+#include <resolv.h>

+#include <unistd.h>

+

+unsigned int

+res_randomid (void) {

+  return 0xffff & __getpid ();

+}

+libc_hidden_def (__res_randomid)