diff options
author | 2003-05-08 23:30:01 +0000 | |
---|---|---|
committer | 2003-05-08 23:30:01 +0000 | |
commit | 2a8191c772ca0adc498bd6f164a933e987c571f2 (patch) | |
tree | 80b820010a3c2cf10b84d7da3c7eaaab4595df67 /lib/libc | |
parent | move insque(3) and remque(3) from libcompat -> libc; they are now POSIX (diff) | |
download | wireguard-openbsd-2a8191c772ca0adc498bd6f164a933e987c571f2.tar.xz wireguard-openbsd-2a8191c772ca0adc498bd6f164a933e987c571f2.zip |
Move setrgid(3) and setruid(3) from libc -> libcompat.
Programs should not be using these...
Diffstat (limited to 'lib/libc')
-rw-r--r-- | lib/libc/compat-43/Makefile.inc | 7 | ||||
-rw-r--r-- | lib/libc/compat-43/setrgid.c | 47 | ||||
-rw-r--r-- | lib/libc/compat-43/setruid.3 | 84 | ||||
-rw-r--r-- | lib/libc/compat-43/setruid.c | 47 |
4 files changed, 3 insertions, 182 deletions
diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc index ffd0419b575..e6a37906786 100644 --- a/lib/libc/compat-43/Makefile.inc +++ b/lib/libc/compat-43/Makefile.inc @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile.inc,v 1.6 2003/01/31 21:47:45 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2003/05/08 23:30:01 millert Exp $ # compat-43 sources .PATH: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/compat-43 ${LIBCSRCDIR}/compat-43 SRCS+= creat.c getdtablesize.c gethostid.c getwd.c killpg.c sethostid.c \ - setpgrp.c setrgid.c setruid.c sigcompat.c + setpgrp.c sigcompat.c MAN+= creat.3 getdtablesize.3 gethostid.3 killpg.3 \ - setruid.3 sigblock.3 sigpause.3 sigsetmask.3 sigvec.3 + sigblock.3 sigpause.3 sigsetmask.3 sigvec.3 -MLINKS+=setruid.3 setrgid.3 MLINKS+=gethostid.3 sethostid.3 MLINKS+=sigblock.3 sigmask.3 diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c deleted file mode 100644 index a7829632010..00000000000 --- a/lib/libc/compat-43/setrgid.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 1983 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setrgid.c,v 1.9 2002/10/30 20:15:29 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include <sys/types.h> -#include <unistd.h> - -__warn_references(setrgid, "warning: this program uses setrgid(), which is deprecated."); - -int -setrgid(gid_t rgid) -{ - return (setresgid(rgid, (gid_t)-1, rgid)); -} diff --git a/lib/libc/compat-43/setruid.3 b/lib/libc/compat-43/setruid.3 deleted file mode 100644 index 58e883f2086..00000000000 --- a/lib/libc/compat-43/setruid.3 +++ /dev/null @@ -1,84 +0,0 @@ -.\" Copyright (c) 1983, 1991 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. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 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. -.\" -.\" $OpenBSD: setruid.3,v 1.6 2002/10/30 20:18:41 millert Exp $ -.\" -.Dd April 19, 1991 -.Dt SETRUID 3 -.Os -.Sh NAME -.Nm setruid , -.Nm setrgid -.Nd set user and group ID -.Sh SYNOPSIS -.Fd #include <sys/types.h> -.Ft int -.Fn setruid "uid_t uid" -.Ft int -.Fn setrgid "gid_t gid" -.Sh DESCRIPTION -The -.Fn setruid -function -.Pq Fn setrgid -sets the real user ID (group ID) -of the current process to the specified value. -.Sh RETURN VALUES -Upon success, these functions return 0; -otherwise \-1 is returned. -.Pp -If the user is not the super user, or the UID (GID) specified is not -the real or effective ID of the process, -these functions return \-1. -.Sh SEE ALSO -.Xr getgid 2 , -.Xr getuid 2 , -.Xr setegid 2 , -.Xr seteuid 2 , -.Xr setgid 2 , -.Xr setresgid 2 , -.Xr setresuid 2 , -.Xr setuid 2 -.Sh HISTORY -The -.Fn setruid -and -.Fn setrgid -functions appeared in -.Bx 4.2 . -Semantically different versions appeared in -.Bx 4.4 . -The current versions, with the old semantics restored, are implemented via the -.Xr setresgid 2 -and -.Xr setresuid 2 -functions, which first appeared in -.Ox 3.3 . diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c deleted file mode 100644 index a99f5700d8f..00000000000 --- a/lib/libc/compat-43/setruid.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 1983 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 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. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setruid.c,v 1.9 2002/10/30 20:15:29 millert Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include <sys/types.h> -#include <unistd.h> - -__warn_references(setruid, "warning: this program uses setruid(), which is deprecated."); - -int -setruid(uid_t ruid) -{ - return (setresuid(ruid, (uid_t)-1, ruid)); -} |