diff options
Diffstat (limited to 'sysutils/fusefs-httpfs/files/patch-httpfs2.c')
| -rw-r--r-- | sysutils/fusefs-httpfs/files/patch-httpfs2.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/sysutils/fusefs-httpfs/files/patch-httpfs2.c b/sysutils/fusefs-httpfs/files/patch-httpfs2.c index 512f4eb6d4e7..c18b96efd4a4 100644 --- a/sysutils/fusefs-httpfs/files/patch-httpfs2.c +++ b/sysutils/fusefs-httpfs/files/patch-httpfs2.c @@ -1,5 +1,5 @@ ---- httpfs2.c.orig 2013-02-19 15:45:06.000000000 +0100 -+++ httpfs2.c 2013-02-19 15:48:43.000000000 +0100 +--- httpfs2.c.orig 2012-09-03 14:58:02 UTC ++++ httpfs2.c @@ -35,7 +35,7 @@ #include <assert.h> #include <ctype.h> @@ -9,7 +9,7 @@ #include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> -@@ -188,7 +188,7 @@ +@@ -188,7 +188,7 @@ static char * b64_encode(unsigned const char* ptr, lon static int httpfs_stat(fuse_ino_t ino, struct stat *stbuf) { @@ -18,7 +18,7 @@ switch (ino) { case 1: stbuf->st_mode = S_IFDIR | 0755; -@@ -257,7 +257,7 @@ +@@ -257,7 +257,7 @@ static void dirbuf_add(fuse_req_t req, struct dirbuf * b->size += fuse_add_direntry(req, NULL, 0, name, NULL, 0); b->p = (char *) realloc(b->p, b->size); memset(&stbuf, 0, sizeof(stbuf)); @@ -27,7 +27,7 @@ fuse_add_direntry(req, b->p + oldsize, b->size - oldsize, name, &stbuf, (off_t) b->size); } -@@ -667,7 +667,7 @@ +@@ -667,11 +667,12 @@ static char * url_encode(char * path) { static int init_url(struct_url* url) { @@ -36,3 +36,18 @@ url->sock_type = SOCK_CLOSED; url->timeout = TIMEOUT; #ifdef USE_SSL +- url->cafile = CERT_STORE; ++ if ((url->cafile = getenv("CERT_STORE")) == NULL) ++ url->cafile = CERT_STORE; + #endif + return 0; + } +@@ -911,7 +912,7 @@ int main(int argc, char *argv[]) + return 3; + } + #ifdef USE_SSL +- else { ++ else if(main_url.ss != NULL) { + print_ssl_info(main_url.ss); + } + #endif |