Merge pull request #31 from whawty/fix_authors

equinox0815 · web-flow · commit 64cf8619f9e3 · 2016-11-26T23:56:48.000+01:00
fixed authors, closes #30
diff --git a/AUTHORS b/AUTHORS
@@ -1,2 +1,5 @@
 Christian Pointner <equinox@spreadspace.org>
 Markus Grüneis <gimpf@gimpf.org>
+Peter Grassberger <petertheone@gmail.com>
+Stefan More <spam+whawty@2094.cc>
+Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
-Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-              2016 Markus Grüneis <gimpf@gimpf.org>
+Copyright (c) 2016 whawty contributors (see AUTHORS file)
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This socket is also used by the **PAM** module which can be used to bring whawty
 
 The whawty.auth app can be configured to automatically do upgrades to newer hash algorithms when a user logs
 in. This way it is possible to smoothly upgrade to newer/stronger hashing formats. The app also supports
-synchronisation between multiple hosts. A sample setup for this can be found [here](app/sync/README.md).
+synchronization between multiple hosts. A sample setup for this can be found [here](app/sync/README.md).
 
 ## golang API
 
@@ -29,9 +29,8 @@ synchronisation between multiple hosts. A sample setup for this can be found [he
 ## License
 
     3-clause BSD
-
-    © 2016 Christian Pointner <equinox@spreadspace.org>
-    © 2016 Markus Grüneis <gimpf@gimpf.org>
+    
+    © 2016 whawty contributors (see AUTHORS file)
 
     whawty.auth makes use of zxcvbn from https://github.com/dropbox/zxcvbn.
     The license of zxcvbn can be found in the file LICENSE.zxcvbn
diff --git a/app/Makefile b/app/Makefile
@@ -1,6 +1,5 @@
 ##
-## Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-##               2016 Markus Grüneis <gimpf@gimpf.org>
+## Copyright (c) 2016 whawty contributors (see AUTHORS file)
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/app/hooks.go b/app/hooks.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/app/main.go b/app/main.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/app/policy.go b/app/policy.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/app/sasl_socket.go b/app/sasl_socket.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/app/store.go b/app/store.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/app/sync/README.md b/app/sync/README.md
@@ -1,13 +1,13 @@
 # whawty.auth store sync
 
-As the whawty.auth store is just a simple directory you may synchronise multiple
+As the whawty.auth store is just a simple directory you may synchronize multiple
 instances using rsync. One way to do this is documented here.
 
 ## Introduction
 
-The synchronisation is based on a simple master slave system. The master host is an app
+The synchronization is based on a simple master slave system. The master host is an app
 running on one machine which might be configured to do local upgrades (see below). One or
-more slaves use systemd.timer, rsync and ssh to synchronise the local file store with
+more slaves use systemd.timer, rsync and ssh to synchronize the local file store with
 the one on the (remote) master host.
 
 ### context upgrades
@@ -16,7 +16,7 @@ The whawty.auth app can be configured to automatically upgrade passwords hashes
 authenticate against it. For this to work the storage backend compares the current default
 hashing format and default `context-id`, as set by the store configuration, with the one which
 was used to generate the current hash. If the format or `context-id`'s differ it marks the
-hash as upgradeable. After a successful authentication the app now does one of the following:
+hash as upgrade-able. After a successful authentication the app now does one of the following:
 
 - **do nothing:** no upgrade will be done, the hash files will stay untouched
 - **local upgrades:** do an update operation on the local store
@@ -82,16 +82,16 @@ hashes from the master using the following command:
 
     # sudo -u whawty-auth rsync -rlptv --delete -e ssh whawty-auth-master::store /var/lib/whawty/auth/store
 
-On the first connection you will get asked to accept the ssh fingreprint of the master. If you run
-the command a second time no errors/warnings shoulb be shown.
-After that you can enable the synchronisation by copying the files `whawty-auth-sync.service` and
+On the first connection you will get asked to accept the ssh fingerprint of the master. If you run
+the command a second time no errors/warnings should be shown.
+After that you can enable the synchronization by copying the files `whawty-auth-sync.service` and
 `whawty-auth-sync.timer` to `/etc/systemd/system` and enabling the timer using the following commands:
 
     # systemctl daemon-reload
     # systemctl enable whawty-auth-sync.timer
     # systemctl start whawty-auth-sync.timer
 
-If you also want to have automatic `context-id` upgrades on succesfull logins you need to configure the
+If you also want to have automatic `context-id` upgrades on successful logins you need to configure the
 slave to do remote upgrades using the the following as an argument to the `--do-upgrades` command line option:
 
     https://whawty-auth-master.example.com/api/update
diff --git a/app/web_api.go b/app/web_api.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/app/web_session.go b/app/web_session.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/doc/SCHEMA.md b/doc/SCHEMA.md
@@ -15,10 +15,10 @@ The difference between admins and normal users is that admin users are
 allowed to add new users. Also granting admin privileges to normal users
 may only be done by admins. An admin is also allowed to change any password.
 Normal users may only update their own password.
-However this mechanism is not intended as a replacement for a real authorisation
+However this mechanism is not intended as a replacement for a real authorization
 database but should only be used by management interfaces of a whawty.auth agent.
 You may want to take a look at [whawty.groups](https://github.com/whawty/groups)
-if you need an authorisation database.
+if you need an authorization database.
 
 The directory may also contains a `.tmp` directory: agents that update
 the whawty.auth base must perform file modifications atomically by
diff --git a/pam/Makefile b/pam/Makefile
@@ -1,6 +1,5 @@
 ##
-## Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-##               2016 Markus Grüneis <gimpf@gimpf.org>
+## Copyright (c) 2016 whawty contributors (see AUTHORS file)
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
diff --git a/pam/pam_whawty.c b/pam/pam_whawty.c
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/examples/client/client.go b/sasl/examples/client/client.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/examples/decode/decode.go b/sasl/examples/decode/decode.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/examples/encode/encode.go b/sasl/examples/encode/encode.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/examples/marshal/marshal.go b/sasl/examples/marshal/marshal.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/examples/server/server.go b/sasl/examples/server/server.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/fuzz.go b/sasl/fuzz.go
@@ -1,7 +1,6 @@
 // +build gofuzz
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/sasl.go b/sasl/sasl.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/sasl_encoding.go b/sasl/sasl_encoding.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/sasl/sasl_encoding_test.go b/sasl/sasl_encoding_test.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/store/config.go b/store/config.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/store/store.go b/store/store.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/store/store_test.go b/store/store_test.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/store/userhash.go b/store/userhash.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/store/userhash_scryptauth.go b/store/userhash_scryptauth.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/store/userhash_test.go b/store/userhash_test.go
@@ -1,6 +1,5 @@
 //
-// Copyright (c) 2016 Christian Pointner <equinox@spreadspace.org>
-//               2016 Markus Grüneis <gimpf@gimpf.org>
+// Copyright (c) 2016 whawty contributors (see AUTHORS file)
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
