X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mysql_selector.c;h=a2a5bcddaf8b031cb10a02660285f9aa93510b36;hb=68fd19196e90eee5a8db43d2854c4a3d5f69206b;hp=9363dba45c0b7a031adf5f9e0b64326243ee0b1a;hpb=c2708c767b300a33c8636681ed4550d4f3be0ce0;p=paraslash.git

diff --git a/mysql_selector.c b/mysql_selector.c
index 9363dba4..a2a5bcdd 100644
--- a/mysql_selector.c
+++ b/mysql_selector.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1999-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 /** \endcond */
 #include "server.cmdline.h"
 #include "server.h"
-#include "afs.h"
+#include "vss.h"
 #include "db.h"
 #include <mysql/mysql.h>
 #include <mysql/mysql_version.h>
@@ -113,7 +113,7 @@ static struct server_command cmds[] = {
 {
 .name = "cs",
 .handler = com_cs,
-.perms = AFS_WRITE | DB_READ | DB_WRITE,
+.perms = VSS_WRITE | DB_READ | DB_WRITE,
 .description = "change stream",
 .synopsis = "cs [s]",
 .help =
@@ -124,7 +124,7 @@ static struct server_command cmds[] = {
 {
 .name = "csp",
 .handler = com_cs,
-.perms = AFS_WRITE | DB_READ,
+.perms = VSS_WRITE | DB_READ,
 .description = "change stream and play",
 .synopsis = "csp s",
 .help =
@@ -289,7 +289,7 @@ static struct server_command cmds[] = {
 {
 .name = "ns",
 .handler = com_ps,
-.perms = AFS_WRITE | DB_READ | DB_WRITE,
+.perms = VSS_WRITE | DB_READ | DB_WRITE,
 .description = "change to next stream",
 .synopsis = "ns",
 .help =
@@ -377,7 +377,7 @@ static struct server_command cmds[] = {
 {
 .name = "ps",
 .handler = com_ps,
-.perms = AFS_WRITE | DB_READ | DB_WRITE,
+.perms = VSS_WRITE | DB_READ | DB_WRITE,
 .description = "change to previous stream",
 .synopsis = "ps",
 .help =
@@ -1502,7 +1502,7 @@ static int com_mv(__a_unused int fd, int argc, char *argv[])
 	ret = -E_ESCAPE;
 	ebn1 = escaped_basename(argv[1]);
 	ebn2 = escaped_basename(argv[2]);
-	if (!ebn1 || !ebn2 | !*ebn1 || !*ebn2)
+	if (!ebn1 || !ebn2 || !*ebn1 || !*ebn2)
 		goto out;
 	ret = -E_MYSQL_SYNTAX;
 	if (!strcmp(ebn1, ebn2))
@@ -2074,9 +2074,9 @@ static int com_cs(int fd, int argc, char *argv[])
 	}
 	if (csp) {
 		mmd_lock();
-		mmd->new_afs_status_flags |= AFS_PLAYING;
+		mmd->new_vss_status_flags |= VSS_PLAYING;
 		if (stream_change)
-			mmd->new_afs_status_flags |= AFS_NEXT;
+			mmd->new_vss_status_flags |= VSS_NEXT;
 		mmd_unlock();
 	}
 	ret = 1;