Imported Upstream version 3.3.3

[debian/amanda] / device-src / s3.h

diff --git a/device-src/s3.h b/device-src/s3.h
index e8fd74dc7231c1598be8283886b039f4988a8af5..49cb00a6593ec2140d9b6e07b5e9b29590f26b85 100644 (file)
--- a/device-src/s3.h
+++ b/device-src/s3.h
@@ -1,9 +1,10 @@
 /*
  * Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -31,7 +32,8 @@ typedef enum {
    S3_API_S3,
    S3_API_SWIFT_1,
    S3_API_SWIFT_2,
-   S3_API_OAUTH2
+   S3_API_OAUTH2,
+   S3_API_CASTOR
 } S3_api;
 
 /* An opaque handle.  S3Handles should only be accessed from a single
@@ -262,7 +264,9 @@ s3_open(const char * access_key, const char *secret_key,
        const char *client_id,
        const char *client_secret,
        const char *refresh_token,
-       const gboolean reuse_connection);
+       const gboolean reuse_connection,
+        const char *reps,
+        const char *reps_bucket);
 
 /* latest step of setting up the S3Handle.
  *