X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pfix-srsd%2Fmain-srsd.c;h=917aa385d1ae1144d96f6f29bc4621787516330e;hb=ee166a1830b1ece4904c2d83ce4b861ce079f66a;hp=acaa3fccc02ff0a20af6cb7e95e14d6e9dd84189;hpb=1f20b76400d58d143d433236a26b43e2c25da1f5;p=apps%2Fpfixtools.git

diff --git a/pfix-srsd/main-srsd.c b/pfix-srsd/main-srsd.c
index acaa3fc..917aa38 100644
--- a/pfix-srsd/main-srsd.c
+++ b/pfix-srsd/main-srsd.c
@@ -16,17 +16,20 @@
 /*     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.                                           */
+/*  THIS SOFTWARE IS PROVIDED BY THE 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 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.                                               */
+/*                                                                            */
+/*   Copyright (c) 2006-2008 the Authors                                      */
+/*   see AUTHORS and source files for details                                 */
 /******************************************************************************/
 
 /*
@@ -43,7 +46,7 @@
 #include "server.h"
 
 #define DAEMON_NAME             "pfix-srsd"
-#define DAEMON_VERSION          "0.3"
+#define DAEMON_VERSION          "0.5"
 #define DEFAULT_ENCODER_PORT    10001
 #define DEFAULT_DECODER_PORT    10002
 #define RUNAS_USER              "nobody"
@@ -120,7 +123,7 @@ int process_srs(client_t *srsd, void* vconfig)
         }
 
         if (strncmp("get ", ibuf->data, 4)) {
-						err("bad request, not starting with \"get \"");
+            err("bad request, not starting with \"get \"");
             return -1;
         }
 
@@ -128,7 +131,7 @@ int process_srs(client_t *srsd, void* vconfig)
         for (q = nl++; q >= p && isspace(*q); *q-- = '\0');
 
         if (p == q) {
-            buffer_addstr(&*obuf, "400 empty request ???\n");
+            buffer_addstr(obuf, "400 empty request ???\n");
             warn("empty request");
             goto skip;
         }
@@ -142,16 +145,16 @@ int process_srs(client_t *srsd, void* vconfig)
         }
 
         if (err == 0) {
-            buffer_addstr(&*obuf, "200 ");
-            buffer_addstr(&*obuf, buf);
+            buffer_addstr(obuf, "200 ");
+            buffer_addstr(obuf, buf);
         } else {
             switch (SRS_ERROR_TYPE(err)) {
               case SRS_ERRTYPE_SRS:
               case SRS_ERRTYPE_SYNTAX:
-                buffer_addstr(&*obuf, "500 ");
+                buffer_addstr(obuf, "500 ");
                 break;
               default:
-                buffer_addstr(&*obuf, "400 ");
+                buffer_addstr(obuf, "400 ");
                 break;
             }
             buffer_addstr(obuf, srs_strerror(err));
@@ -304,7 +307,7 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    info("starting %s v%s...", DAEMON_NAME, DAEMON_VERSION);
+    info("%s v%s...", DAEMON_NAME, DAEMON_VERSION);
 
     config.domain = argv[optind];
     config.srs = srs_read_secrets(argv[optind + 1]);