lib: further adoption of SPDX licensing ID tags.

Mainly focus on files that use BSD 2-Clause license, however the tool I
was using mis-identified many licenses so this was mostly a manual - error
prone - task.

The Software Package Data Exchange (SPDX) group provides a specification
to make it easier for automated tools to detect and summarize well known
opensource licenses. We are gradually adopting the specification, noting
that the tags are considered only advisory and do not, in any way,
superceed or replace the license texts.

diff --git a/libutil/flopen.c b/libutil/flopen.c
index bb5d99629a3efeb9c6fcf17ce9e2dde25c7ce6f8..485eee4c1109b00b179acd3daeadd9bc6d0f6049 100644 (file)
--- a/libutil/flopen.c
+++ b/libutil/flopen.c
@@ -1,4 +1,6 @@
 /*-
 /*-

+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *

  * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
  * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *

diff --git a/libutil/gr_util.c b/libutil/gr_util.c
index fcc08209e0cc4df85ed5f2d9096ec266b086785a..796cbf021ded95b1ccfb3e21b7dac366ae2bde23 100644 (file)
--- a/libutil/gr_util.c
+++ b/libutil/gr_util.c
@@ -1,4 +1,6 @@
 /*-
 /*-

+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *

  * Copyright (c) 2008 Sean C. Farley <scf@FreeBSD.org>
  * All rights reserved.
  *
  * Copyright (c) 2008 Sean C. Farley <scf@FreeBSD.org>
  * All rights reserved.
  *

diff --git a/libutil/libutil.h b/libutil/libutil.h
index fa924dbd28be81c97346c9c4ab83024e42043875..c79eaac5a5fafef54a82d395d691705a9aa30f98 100644 (file)
--- a/libutil/libutil.h
+++ b/libutil/libutil.h
@@ -1,4 +1,6 @@
-/*
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *

  * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
  * All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.
  * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
  * All rights reserved.
  * Copyright (c) 2002 Networks Associates Technology, Inc.

diff --git a/libutil/login_crypt.c b/libutil/login_crypt.c
new file mode 100644 (file)
index 0000000..b5ab10e
--- /dev/null
+++ b/libutil/login_crypt.c
@@ -0,0 +1,52 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2000 Brian Fundakowski Feldman
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+
+#include <login_cap.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+const char *
+login_setcryptfmt(login_cap_t *lc, const char *def, const char *error) {
+       const char *cipher;
+
+       cipher = login_getcapstr(lc, "passwd_format", def, NULL);
+       if (getenv("CRYPT_DEBUG") != NULL)
+               fprintf(stderr, "login_setcryptfmt: "
+                   "passwd_format = %s\n", cipher);
+       if (cipher == NULL)
+               return (error);
+       if (!crypt_set_format(cipher))
+               return (error);
+       return (cipher);
+}